From d26f0a4c407a5d13a095c7676b397e51a959d82c Mon Sep 17 00:00:00 2001 From: Ryan Boren Date: Thu, 8 Dec 2011 23:02:33 +0000 Subject: [PATCH] Pinking shears git-svn-id: https://develop.svn.wordpress.org/trunk@19577 602fd350-edb4-49c9-b593-d223f7449a82 --- wp-admin/css/wp-admin-rtl.dev.css | 2 +- wp-admin/includes/update-core.php | 2 +- wp-admin/network/site-themes.php | 20 +++++++++---------- wp-admin/network/site-users.php | 12 +++++------ wp-admin/network/themes.php | 12 +++++------ wp-admin/network/user-new.php | 4 ++-- wp-admin/network/users.php | 4 ++-- .../tinymce/plugins/wpdialogs/js/popup.dev.js | 6 +++--- .../wpfullscreen/css/wp-fullscreen.css | 2 +- wp-includes/js/tinymce/wp-mce-help.php | 6 +++--- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/wp-admin/css/wp-admin-rtl.dev.css b/wp-admin/css/wp-admin-rtl.dev.css index c19c6f0566..3bf4c0fb5f 100644 --- a/wp-admin/css/wp-admin-rtl.dev.css +++ b/wp-admin/css/wp-admin-rtl.dev.css @@ -1420,7 +1420,7 @@ h2 .nav-tab { } .about-wrap .feature-section .feature-images img { - margin-right: auto; + margin-right: auto; margin-left: 5px; } .about-wrap .feature-section.images-stagger-left .angled-left { diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 3588648d5b..b8d2c1d43f 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -547,7 +547,7 @@ function _redirect_to_about_wordpress( $new_version ) { if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action ) return; - + // Load the updated default text localization domain for new strings load_default_textdomain(); diff --git a/wp-admin/network/site-themes.php b/wp-admin/network/site-themes.php index 33dc39ff47..6468175943 100644 --- a/wp-admin/network/site-themes.php +++ b/wp-admin/network/site-themes.php @@ -45,8 +45,8 @@ $action = $wp_list_table->current_action(); $s = isset($_REQUEST['s']) ? $_REQUEST['s'] : ''; // Clean up request URI from temporary args for screen options/paging uri's to work as expected. -$temp_args = array( 'enabled', 'disabled', 'error' ); -$_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] ); +$temp_args = array( 'enabled', 'disabled', 'error' ); +$_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] ); $referer = remove_query_arg( $temp_args, wp_get_referer() ); $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; @@ -81,7 +81,7 @@ if ( $action ) { check_admin_referer( 'disable-theme_' . $_GET['theme'] ); $theme = $_GET['theme']; $action = 'disabled'; - $n = 1; + $n = 1; if ( !$allowed_themes ) $allowed_themes = array(); else @@ -158,13 +158,13 @@ foreach ( $tabs as $tab_id => $tab ) {

' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '

'; -} elseif ( isset( $_GET['disabled'] ) ) { - $_GET['disabled'] = absint( $_GET['disabled'] ); - echo '

' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '

'; -} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) { - echo '

' . __( 'No theme selected.' ) . '

'; + $_GET['enabled'] = absint( $_GET['enabled'] ); + echo '

' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '

'; +} elseif ( isset( $_GET['disabled'] ) ) { + $_GET['disabled'] = absint( $_GET['disabled'] ); + echo '

' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '

'; +} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) { + echo '

' . __( 'No theme selected.' ) . '

'; } ?>

diff --git a/wp-admin/network/site-users.php b/wp-admin/network/site-users.php index 6079c54f93..b45617fd78 100644 --- a/wp-admin/network/site-users.php +++ b/wp-admin/network/site-users.php @@ -36,7 +36,7 @@ get_current_screen()->set_help_sidebar( '

' . __('Support Forums') . '

' ); -$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] ); +$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] ); $referer = remove_query_arg( 'update', wp_get_referer() ); $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0; @@ -66,7 +66,7 @@ $action = $wp_list_table->current_action(); if ( $action ) { switch_to_blog( $id ); - + switch ( $action ) { case 'newuser': check_admin_referer( 'add-user', '_wpnonce_add-new-user' ); @@ -91,7 +91,7 @@ if ( $action ) { check_admin_referer( 'add-user', '_wpnonce_add-user' ); if ( !empty( $_POST['newuser'] ) ) { $update = 'adduser'; - $newuser = $_POST['newuser']; + $newuser = $_POST['newuser']; $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) ); if ( $userid ) { $user = $wpdb->get_var( "SELECT user_id FROM " . $wpdb->usermeta . " WHERE user_id='$userid' AND meta_key='{$blog_prefix}capabilities'" ); @@ -106,12 +106,12 @@ if ( $action ) { $update = 'err_add_notfound'; } break; - + case 'remove': if ( !current_user_can('remove_users') ) die(__('You can’t remove users.')); check_admin_referer( 'bulk-users' ); - + $update = 'remove'; if ( isset( $_REQUEST['users'] ) ) { $userids = $_REQUEST['users']; @@ -151,7 +151,7 @@ if ( $action ) { } break; } - + restore_current_blog(); wp_redirect( add_query_arg( 'update', $update, $referer ) ); exit(); diff --git a/wp-admin/network/themes.php b/wp-admin/network/themes.php index 3e1e357e17..c9d09913ed 100644 --- a/wp-admin/network/themes.php +++ b/wp-admin/network/themes.php @@ -34,7 +34,7 @@ $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] $referer = remove_query_arg( $temp_args, wp_get_referer() ); if ( $action ) { - $allowed_themes = get_site_option( 'allowedthemes' ); + $allowed_themes = get_site_option( 'allowedthemes' ); switch ( $action ) { case 'enable': check_admin_referer('enable-theme_' . $_GET['theme']); @@ -128,11 +128,11 @@ if ( $action ) { if ( $data['Name'] == $main_theme ) { unset( $themes[$key] ); } else { - $files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) ); + $files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) ); $theme_info[ $theme ] = $data; } } - + if ( empty( $themes ) ) { wp_redirect( add_query_arg( 'error', 'main', $referer ) ); exit; @@ -190,7 +190,7 @@ if ( $action ) { foreach ( $themes as $theme ) $delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) ); - $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1; + $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1; wp_redirect( network_admin_url( "themes.php?deleted=".count( $themes )."&paged=$paged&s=$s" ) ); exit; break; @@ -228,8 +228,8 @@ require_once(ABSPATH . 'wp-admin/admin-header.php');

' . __('Search results for “%s”') . '', esc_html( $s ) ); ?> +if ( $s ) + printf( '' . __('Search results for “%s”') . '', esc_html( $s ) ); ?>

errors ) ) { $add_user_errors = $user_details[ 'errors' ]; } else { @@ -86,7 +86,7 @@ if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?> ?>
-
+ diff --git a/wp-admin/network/users.php b/wp-admin/network/users.php index ddf4a0aa28..92695b9655 100644 --- a/wp-admin/network/users.php +++ b/wp-admin/network/users.php @@ -211,7 +211,7 @@ if ( isset( $_GET['action'] ) ) { wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) ); exit(); - break; + break; } } @@ -281,7 +281,7 @@ if ( isset( $_REQUEST['updated'] ) && $_REQUEST['updated'] == 'true' && ! empty( if ( current_user_can( 'create_users') ) : ?> ' . __( 'Search results for “%s”' ) . '', esc_html( $usersearch ) ); ?> diff --git a/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js b/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js index a02a8eb237..b45a1fd2e5 100644 --- a/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js +++ b/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js @@ -1,8 +1,8 @@ /** * popup.js - * + * * An altered version of tinyMCEPopup to work in the same window as tinymce. - * + * * ------------------------------------------------------------------ * * Copyright 2009, Moxiecode Systems AB @@ -278,7 +278,7 @@ var tinyMCEPopup = { close(); }, - // Internal functions + // Internal functions _restoreSelection : function() { var e = window.event.srcElement; diff --git a/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css b/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css index a60af77767..267f467495 100644 --- a/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css +++ b/wp-includes/js/tinymce/plugins/wpfullscreen/css/wp-fullscreen.css @@ -1,7 +1,7 @@ /* Distraction Free Writing mode TinyMCE Styles */ - + html, body { background: transparent; width: auto !important; diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index 1af7427138..43dbe29764 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -143,7 +143,7 @@ wp_admin_css( 'wp-admin', true ); .macwebkit tr.mac { display: table-row; } - +