diff --git a/wp-admin/admin-header.php b/wp-admin/admin-header.php index 555efc3aaa..6ad9ff98ce 100644 --- a/wp-admin/admin-header.php +++ b/wp-admin/admin-header.php @@ -87,7 +87,7 @@ if ( 'index.php' == $pagenow ) { $breadcrumb = '' . __('Dashboard') . ' › ' . $title; } ?> -

+

+ + + + + + + - -
- $page_links
"; ?> + +
+ + + +
+
+
+ diff --git a/wp-admin/css/colors-classic.css b/wp-admin/css/colors-classic.css index 59a2adab1d..b434430676 100644 --- a/wp-admin/css/colors-classic.css +++ b/wp-admin/css/colors-classic.css @@ -321,7 +321,12 @@ div.dashboard-widget-submit input, } .widefat thead, +.widefat tfoot, .thead, +.tfoot, +h3.dashboard-widget-title, +h3.dashboard-widget-title span, +h3.dashboard-widget-title small, .find-box-head { background-color: #464646; color: #d7d7d7; diff --git a/wp-admin/css/colors-fresh.css b/wp-admin/css/colors-fresh.css index 3c47547bbd..f024eb5c98 100644 --- a/wp-admin/css/colors-fresh.css +++ b/wp-admin/css/colors-fresh.css @@ -315,7 +315,9 @@ div.dashboard-widget-submit input, } .widefat thead, +.widefat tfoot, .thead, +.tfoot, h3.dashboard-widget-title, h3.dashboard-widget-title span, h3.dashboard-widget-title small, diff --git a/wp-admin/edit-attachment-rows.php b/wp-admin/edit-attachment-rows.php index 7c5b5fe9d2..93ebd3bba8 100644 --- a/wp-admin/edit-attachment-rows.php +++ b/wp-admin/edit-attachment-rows.php @@ -14,6 +14,13 @@ if ( ! defined('ABSPATH') ) die(); + + + + + + + query( "DELETE FROM $wpdb->comments WHERE comment_approved = 'spam'" ); wp_redirect('edit-comments.php?deleted=' . (int) $deleted_spam); } -if ( !empty( $_REQUEST['delete_comments'] ) && isset($_REQUEST['action']) ) { +if ( isset($_REQUEST['delete_comments']) && isset($_REQUEST['action']) && ( -1 != $_REQUEST['action'] || -1 != $_REQUEST['action2'] ) ) { check_admin_referer('bulk-comments'); + $doaction = ( -1 != $_REQUEST['action'] ) ? $_REQUEST['action'] : $_REQUEST['action2']; + + $deleted = $approved = $unapproved = $spammed = 0; + foreach ( (array) $_REQUEST['delete_comments'] as $comment_id) : // Check the permissions on each + $comment_id = (int) $comment_id; + $post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) ); - $comments_deleted = $comments_approved = $comments_unapproved = $comments_spammed = 0; - foreach ($_REQUEST['delete_comments'] as $comment) : // Check the permissions on each - $comment = (int) $comment; - $post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment) ); if ( !current_user_can('edit_post', $post_id) ) continue; - if ( $_REQUEST['action'] == 'markspam' ) { - wp_set_comment_status($comment, 'spam'); - $comments_spammed++; - } elseif ( $_REQUEST['action'] == 'delete' ) { - wp_set_comment_status($comment, 'delete'); - $comments_deleted++; - } elseif ( $_REQUEST['action'] == 'approve' ) { - wp_set_comment_status($comment, 'approve'); - $comments_approved++; - } elseif ( $_REQUEST['action'] == 'unapprove' ) { - wp_set_comment_status($comment, 'hold'); - $comments_unapproved++; + + switch( $doaction ) { + case 'markspam' : + wp_set_comment_status($comment_id, 'spam'); + $spammed++; + break; + case 'delete' : + wp_set_comment_status($comment_id, 'delete'); + $deleted++; + break; + case 'approve' : + wp_set_comment_status($comment_id, 'approve'); + $approved++; + break; + case 'unapprove' : + wp_set_comment_status($comment_id, 'hold'); + $unapproved++; + break; } endforeach; - $redirect_to = basename( __FILE__ ) . '?deleted=' . $comments_deleted . '&approved=' . $comments_approved . '&spam=' . $comments_spammed . '&unapproved=' . $comments_unapproved; + + $redirect_to = 'edit-comments.php?deleted=' . $deleted . '&approved=' . $approved . '&spam=' . $spammed . '&unapproved=' . $unapproved; if ( isset($_REQUEST['apage']) ) $redirect_to = add_query_arg( 'apage', absint($_REQUEST['apage']), $redirect_to ); if ( !empty($_REQUEST['mode']) ) @@ -54,8 +63,8 @@ if ( !empty( $_REQUEST['delete_comments'] ) && isset($_REQUEST['action']) ) { if ( !empty($_REQUEST['s']) ) $redirect_to = add_query_arg('s', $_REQUEST['s'], $redirect_to); wp_redirect( $redirect_to ); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } @@ -111,6 +120,7 @@ if ( isset( $_GET['approved'] ) || isset( $_GET['deleted'] ) || isset( $_GET['sp } } ?> +

@@ -143,7 +153,6 @@ unset($status_links); @@ -210,15 +219,21 @@ if ( 'spam' == $comment_status ) {

- + + + + + + + + +
+
+$page_links
"; +?> + +
+ + + + + + + +
+ +
+ + -
- $page_links
"; ?> + +
+ + +
+

+ diff --git a/wp-admin/edit-pages.php b/wp-admin/edit-pages.php index 5b54febaeb..4ca92243f0 100644 --- a/wp-admin/edit-pages.php +++ b/wp-admin/edit-pages.php @@ -10,17 +10,19 @@ require_once('admin.php'); // Handle bulk actions -if ( isset($_GET['action']) && $_GET['action'] != -1 ) { - switch ( $_GET['action'] ) { +if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { + $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; + + switch ( $doaction ) { case 'delete': if ( isset($_GET['post']) && isset($_GET['doaction']) ) { check_admin_referer('bulk-pages'); foreach( (array) $_GET['post'] as $post_id_del ) { $post_del = & get_post($post_id_del); - + if ( !current_user_can('delete_page', $post_id_del) ) wp_die( __('You are not allowed to delete this page.') ); - + if ( $post_del->post_type == 'attachment' ) { if ( ! wp_delete_attachment($post_id_del) ) wp_die( __('Error in deleting...') ); @@ -35,10 +37,10 @@ if ( isset($_GET['action']) && $_GET['action'] != -1 ) { if ( isset($_GET['post']) ) { check_admin_referer('bulk-pages'); $_GET['post_status'] = $_GET['_status']; - + if ( -1 == $_GET['post_author'] ) unset($_GET['post_author']); - + $done = bulk_edit_posts($_GET); } break; @@ -55,8 +57,8 @@ if ( isset($_GET['action']) && $_GET['action'] != -1 ) { } wp_redirect($sendback); exit(); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } @@ -107,19 +109,26 @@ require_once('admin-header.php'); ?> - +
+ +

- +

-
+ +

|

+

+
+ - -

|

- +
@@ -189,11 +194,9 @@ if ( $page_links ) echo "
$page_links
"; ?> - -
@@ -218,10 +221,36 @@ if ($posts) { + + + + + + + + +
+$page_links
"; +?> + +
+ + +
+ +
+
+ @@ -237,13 +266,6 @@ if ($posts) { } // end if ($posts) ?> -
-$page_links
"; -?> -
-
- + + + + + + + - - - - - diff --git a/wp-admin/edit-tags.php b/wp-admin/edit-tags.php index 480c102270..d52b1220ff 100644 --- a/wp-admin/edit-tags.php +++ b/wp-admin/edit-tags.php @@ -11,9 +11,9 @@ require_once('admin.php'); $title = __('Tags'); -wp_reset_vars(array('action', 'tag')); +wp_reset_vars( array('action', 'tag') ); -if ( isset( $_GET['action'] ) && $_GET['action'] == 'delete' && isset($_GET['delete_tags']) ) +if ( isset( $_GET['action'] ) && isset($_GET['delete_tags']) && ( 'delete' == $_GET['action'] || 'delete' == $_GET['action2'] ) ) $action = 'bulk-delete'; switch($action) { @@ -107,8 +107,8 @@ break; default: -if ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +if ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } @@ -187,6 +187,13 @@ if ( $page_links ) + + + + + + + - -
- $page_links
"; ?> + +
+ + +
+

+
+
diff --git a/wp-admin/edit.php b/wp-admin/edit.php index 54eca34c81..29329a0d66 100644 --- a/wp-admin/edit.php +++ b/wp-admin/edit.php @@ -9,15 +9,11 @@ /** WordPress Administration Bootstrap */ require_once('admin.php'); -$action = -1; -if ( isset($_GET['action2']) && $_GET['action2'] != -1 ) - $action = $_GET['action2']; -if ( isset($_GET['action']) && $_GET['action'] != -1 ) - $action = $_GET['action']; - // Handle bulk actions -if ( $action != -1 ) { - switch ( $action ) { +if ( isset($_GET['action']) && ( -1 != $_GET['action'] || -1 != $_GET['action2'] ) ) { + $doaction = ( -1 != $_GET['action'] ) ? $_GET['action'] : $_GET['action2']; + + switch ( $doaction ) { case 'delete': if ( isset($_GET['post']) && (isset($_GET['doaction']) || isset($_GET['doaction2'])) ) { check_admin_referer('bulk-posts'); @@ -41,18 +37,18 @@ if ( $action != -1 ) { if ( isset($_GET['post']) ) { check_admin_referer('bulk-posts'); $_GET['post_status'] = $_GET['_status']; - + if ( -1 == $_GET['post_author'] ) unset($_GET['post_author']); - + $done = bulk_edit_posts($_GET); } break; } $sendback = wp_get_referer(); - if (strpos($sendback, 'post.php') !== false) $sendback = admin_url('post-new.php'); - elseif (strpos($sendback, 'attachments.php') !== false) $sendback = admin_url('attachments.php'); + if ( strpos($sendback, 'post.php') !== false ) $sendback = admin_url('post-new.php'); + 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'] ); @@ -62,8 +58,8 @@ if ( $action != -1 ) { } wp_redirect($sendback); exit(); -} elseif ( !empty($_GET['_wp_http_referer']) ) { - wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']))); +} elseif ( isset($_GET['_wp_http_referer']) && ! empty($_GET['_wp_http_referer']) ) { + wp_redirect( remove_query_arg( array('_wp_http_referer', '_wpnonce'), stripslashes($_SERVER['REQUEST_URI']) ) ); exit; } @@ -114,7 +110,7 @@ endif; ?>

$label ) { $status_links[] = "

  • " . sprintf( __ngettext( $label[2][0], $label[2][1], $num_posts->$status ), number_format_i18n( $num_posts->$status ) ) . ''; } -echo implode( ' |
    • ', $status_links ) . ''; +echo implode( ' | ', $status_links ) . ''; unset( $status_links ); endif; ?> @@ -319,6 +315,15 @@ if ( 1 == count($posts) && is_singular() ) : + + + + + + + + + + + + + + + + + + + + + +
    + $page_links
    "; ?> +
    +
    + - > + > + + + + + + +

    +
    + +
    + + +
    + +
    +
    +
    -
    -
    -
    - - diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 210b3b26d9..324637515e 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -279,6 +279,17 @@ function print_plugins_table($plugins, $context = '') { + + + + + + + + + + + - -
    @@ -410,8 +408,20 @@ if ( $page_links ) echo "
    $page_links
    "; ?> +
    + +
    +
    +
    +
    - + + + + + + + get_results() as $userid ) {
    page_links(); ?>
    +
    + + +
    +
    @@ -474,7 +490,7 @@ foreach ( $wp_user_search->get_results() as $userid ) { } break; -} // end of the $action switch +} // end of the $doaction switch include('admin-footer.php'); ?>