diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index b434430676..7622e83c96 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -532,11 +532,13 @@ input.readonly { color: #448abd; } -#tagchecklist span a { +#tagchecklist span a, +#bulk-titles div a { background: url(../images/xit.gif) no-repeat; } -#tagchecklist span a:hover { +#tagchecklist span a:hover, +#bulk-titles div a:hover { background: url(../images/xit.gif) no-repeat -10px 0; } diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index f024eb5c98..0e040b9db2 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -516,11 +516,13 @@ input.readonly { color: #448abd; } -#tagchecklist span a { +#tagchecklist span a, +#bulk-titles div a { background: url(../images/xit.gif) no-repeat; } -#tagchecklist span a:hover { +#tagchecklist span a:hover, +#bulk-titles div a:hover { background: url(../images/xit.gif) no-repeat -10px 0; } diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index 214914c241..935840e6c9 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -36,10 +36,13 @@ if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] case 'edit': if ( isset($_GET['post']) ) { check_admin_referer('bulk-pages'); - $_GET['post_status'] = $_GET['_status']; - if ( -1 == $_GET['post_author'] ) - unset($_GET['post_author']); + if ( -1 == $_GET['_status'] ) { + $_GET['post_status'] = null; + unset($_GET['_status'], $_GET['post_status']); + } else { + $_GET['post_status'] = $_GET['_status']; + } $done = bulk_edit_posts($_GET); } @@ -50,10 +53,10 @@ if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); if ( isset($done) ) { - $done['upd'] = count( $done['upd'] ); - $done['skip'] = count( $done['skip'] ); + $done['updated'] = count( $done['updated'] ); + $done['skipped'] = count( $done['skipped'] ); + $done['locked'] = count( $done['locked'] ); $sendback = add_query_arg( $done, $sendback ); - unset($done); } wp_redirect($sendback); exit(); @@ -111,16 +114,21 @@ require_once('admin-header.php'); ?>
- +

-

diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 51d615ff37..4a8f1b0759 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -36,10 +36,13 @@ if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] case 'edit': if ( isset($_GET['post']) ) { check_admin_referer('bulk-posts'); - $_GET['post_status'] = $_GET['_status']; - if ( -1 == $_GET['post_author'] ) - unset($_GET['post_author']); + if ( -1 == $_GET['_status'] ) { + $_GET['post_status'] = null; + unset($_GET['_status'], $_GET['post_status']); + } else { + $_GET['post_status'] = $_GET['_status']; + } $done = bulk_edit_posts($_GET); } @@ -51,10 +54,10 @@ if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] elseif ( strpos($sendback, 'attachments.php') !== false ) $sendback = admin_url('attachments.php'); $sendback = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $sendback); if ( isset($done) ) { - $done['upd'] = count( $done['upd'] ); - $done['skip'] = count( $done['skip'] ); + $done['updated'] = count( $done['updated'] ); + $done['skipped'] = count( $done['skipped'] ); + $done['locked'] = count( $done['locked'] ); $sendback = add_query_arg( $done, $sendback ); - unset($done); } wp_redirect($sendback); exit(); @@ -100,26 +103,31 @@ else
+
+

|

- +

- +if ( (int) $_GET['skipped'] ) + unset($_GET['skipped']); + +if ( (int) $_GET['locked'] ) { + printf( __ngettext( ' %d page not updated, somebody is editing it.', ' %d pages not updated, somebody is editing them.', $_GET['locked'] ), number_format_i18n( $_GET['skipped'] ) ); + unset($_GET['locked']); +} ?>

-
-