diff --git a/wp-admin/admin-ajax.php b/wp-admin/admin-ajax.php index b173572033..73aacca6ea 100644 --- a/wp-admin/admin-ajax.php +++ b/wp-admin/admin-ajax.php @@ -912,7 +912,7 @@ case 'hidden-columns' : $hidden = isset( $_POST['hidden'] )? $_POST['hidden'] : ''; $hidden = explode( ',', $_POST['hidden'] ); $page = isset( $_POST['page'] )? $_POST['page'] : ''; - if ( !preg_match( '/^[a-z-_]+$/', $page ) ) { + if ( !preg_match( '/^[a-z_-]+$/', $page ) ) { die(-1); } $current_user = wp_get_current_user(); diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 07d9fc3be6..fa4bb07b73 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -24,37 +24,22 @@ wp_admin_css( 'css/global' ); wp_admin_css(); wp_admin_css( 'css/colors' ); wp_admin_css( 'css/ie' ); +wp_enqueue_script('utils'); ?> - - - - diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 719af507b4..ae33a25835 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -276,9 +276,8 @@ function post_tags_meta_box($post, $box) { - +

-

diff --git a/wp-admin/edit-link-categories.php b/wp-admin/edit-link-categories.php index 3636635cac..4878fc556d 100644 --- a/wp-admin/edit-link-categories.php +++ b/wp-admin/edit-link-categories.php @@ -224,20 +224,5 @@ if ( $page_links ) - - diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index fd817e3ad1..2d052d9f3d 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -312,20 +312,5 @@ endif; // posts; - - - + - - - - - + //','uid':'ID; ?>','time':''}; //]]> " /> - ' + catL10n.how + '') + $('#jaxcat').prepend('' + catL10n.how + ''); $('#categorychecklist').wpList( { alt: '', response: 'cat-ajax-response', confirm: myConfirm } ); } ); diff --git a/wp-admin/js/categories.dev.js b/wp-admin/js/categories.dev.js index f9a1724a4d..1431b0f2ab 100644 --- a/wp-admin/js/categories.dev.js +++ b/wp-admin/js/categories.dev.js @@ -31,9 +31,4 @@ jQuery(document).ready(function($) { else $('#the-list').wpList({ addAfter: addAfter2 }); - if ( jQuery('#link-category-search-input').size() ) { - columns.init('edit-link-categories'); - } else { - columns.init('categories'); - } }); diff --git a/wp-admin/js/categories.js b/wp-admin/js/categories.js index 484a01c394..962baa451d 100644 --- a/wp-admin/js/categories.js +++ b/wp-admin/js/categories.js @@ -1 +1 @@ -jQuery(document).ready(function(c){var b=false,e,d,a;if(document.forms.addcat.category_parent){b=document.forms.addcat.category_parent.options}e=function(h,g){var f,i;f=c(""+c("name",h).text()+"").html();i=c("cat",h).attr("id");b[b.length]=new Option(f,i);d(h,g)};d=function(f,h){var g=c(h.parsed.responses[0].data);if(g.length==1){inlineEditTax.addEvents(c(g.id))}};a=function(g,f){var i=c("cat",g).attr("id"),h;for(h=0;h"+c("name",h).text()+"").html();i=c("cat",h).attr("id");b[b.length]=new Option(f,i);d(h,g)};d=function(f,h){var g=c(h.parsed.responses[0].data);if(g.length==1){inlineEditTax.addEvents(c(g.id))}};a=function(g,f){var i=c("cat",g).attr("id"),h;for(h=0;h