WordPress.org
Get WordPress

Make WordPress Core

Changeset 19577


Ignore:
Timestamp:
12/08/2011 11:02:33 PM (14 years ago)
Author:
ryan
Message:

Pinking shears

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/wp-admin/css/wp-admin-rtl.dev.css

    r19575 r19577  
    14211421
    14221422.about-wrap .feature-section .feature-images img {
    1423     margin-right: auto; 
     1423    margin-right: auto;
    14241424    margin-left: 5px;
    14251425}

  • trunk/wp-admin/includes/update-core.php

    r19532 r19577  
    548548    if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
    549549        return;
    550  
     550
    551551    // Load the updated default text localization domain for new strings
    552552    load_default_textdomain();

  • trunk/wp-admin/network/site-themes.php

    r19514 r19577  
    4646
    4747// Clean up request URI from temporary args for screen options/paging uri's to work as expected.
    48 $temp_args = array( 'enabled', 'disabled', 'error' ); 
    49 $_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] ); 
     48$temp_args = array( 'enabled', 'disabled', 'error' );
     49$_SERVER['REQUEST_URI'] = remove_query_arg( $temp_args, $_SERVER['REQUEST_URI'] );
    5050$referer = remove_query_arg( $temp_args, wp_get_referer() );
    5151
    … …  
    8282            $theme = $_GET['theme'];
    8383            $action = 'disabled';
    84             $n = 1;         
     84            $n = 1;
    8585            if ( !$allowed_themes )
    8686                $allowed_themes = array();
    … …  
    159159
    160160if ( isset( $_GET['enabled'] ) ) {
    161     $_GET['enabled'] = absint( $_GET['enabled'] ); 
    162     echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>'; 
    163 } elseif ( isset( $_GET['disabled'] ) ) { 
    164     $_GET['disabled'] = absint( $_GET['disabled'] ); 
    165     echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>'; 
    166 } elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) { 
    167     echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>'; 
     161    $_GET['enabled'] = absint( $_GET['enabled'] );
     162    echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>';
     163} elseif ( isset( $_GET['disabled'] ) ) {
     164    $_GET['disabled'] = absint( $_GET['disabled'] );
     165    echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>';
     166} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
     167    echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';
    168168} ?>
    169169

  • trunk/wp-admin/network/site-users.php

    r19514 r19577  
    3737);
    3838
    39 $_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] ); 
     39$_SERVER['REQUEST_URI'] = remove_query_arg( 'update', $_SERVER['REQUEST_URI'] );
    4040$referer = remove_query_arg( 'update', wp_get_referer() );
    4141
    … …  
    6767if ( $action ) {
    6868    switch_to_blog( $id );
    69    
     69
    7070    switch ( $action ) {
    7171        case 'newuser':
    … …  
    9292            if ( !empty( $_POST['newuser'] ) ) {
    9393                $update = 'adduser';
    94                 $newuser = $_POST['newuser'];               
     94                $newuser = $_POST['newuser'];
    9595                $userid = $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM " . $wpdb->users . " WHERE user_login = %s", $newuser ) );
    9696                if ( $userid ) {
    … …  
    107107            }
    108108            break;
    109        
     109
    110110        case 'remove':
    111111            if ( !current_user_can('remove_users')  )
    112112                die(__('You can&#8217;t remove users.'));
    113113            check_admin_referer( 'bulk-users' );
    114            
     114
    115115            $update = 'remove';
    116116            if ( isset( $_REQUEST['users'] ) ) {
    … …  
    152152            break;
    153153    }
    154    
     154
    155155    restore_current_blog();
    156156    wp_redirect( add_query_arg( 'update', $update, $referer ) );

  • trunk/wp-admin/network/themes.php

    r19514 r19577  
    3535
    3636if ( $action ) {
    37     $allowed_themes = get_site_option( 'allowedthemes' );   
     37    $allowed_themes = get_site_option( 'allowedthemes' );
    3838    switch ( $action ) {
    3939        case 'enable':
    … …  
    129129                    unset( $themes[$key] );
    130130                } else {
    131                     $files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );                   
     131                    $files_to_delete = array_merge( $files_to_delete, list_files( WP_CONTENT_DIR . "/themes/$theme" ) );
    132132                    $theme_info[ $theme ] = $data;
    133133                }
    134134            }
    135            
     135
    136136            if ( empty( $themes ) ) {
    137137                wp_redirect( add_query_arg( 'error', 'main', $referer ) );
    … …  
    191191            foreach ( $themes as $theme )
    192192                $delete_result = delete_theme( $theme, esc_url( add_query_arg( array('verify-delete' => 1), $_SERVER['REQUEST_URI'] ) ) );
    193             $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1; 
     193            $paged = ( $_REQUEST['paged'] ) ? $_REQUEST['paged'] : 1;
    194194            wp_redirect( network_admin_url( "themes.php?deleted=".count( $themes )."&paged=$paged&s=$s" ) );
    195195            exit;
    … …  
    229229<?php screen_icon('themes'); ?>
    230230<h2><?php echo esc_html( $title ); if ( current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php }
    231 if ( $s ) 
    232     printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?> 
     231if ( $s )
     232    printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
    233233</h2>
    234234

  • trunk/wp-admin/network/user-new.php

    r19514 r19577  
    4242    $user = $_POST['user'];
    4343
    44     $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] ); 
     44    $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
    4545    if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
    4646        $add_user_errors = $user_details[ 'errors' ];
    … …  
    8787    </div>
    8888<?php } ?>
    89     <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post"> 
     89    <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">
    9090    <table class="form-table">
    9191        <tr class="form-field form-required">

  • trunk/wp-admin/network/users.php

    r19514 r19577  
    212212            wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
    213213            exit();
    214         break; 
     214        break;
    215215    }
    216216}
    … …  
    282282        <a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
    283283    endif;
    284    
     284
    285285    if ( !empty( $usersearch ) )
    286286    printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );

  • trunk/wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js

    r18639 r19577  
    11/**
    22 * popup.js
    3  * 
     3 *
    44 * An altered version of tinyMCEPopup to work in the same window as tinymce.
    5  * 
     5 *
    66 * ------------------------------------------------------------------
    77 *
    … …  
    279279    },
    280280
    281     // Internal functions   
     281    // Internal functions
    282282
    283283    _restoreSelection : function() {

  • trunk/wp-includes/js/tinymce/wp-mce-help.php

    r19227 r19577  
    144144        display: table-row;
    145145    }
    146    
     146
    147147</style>
    148148<?php if ( is_rtl() ) : ?>
    … …  
    182182        document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
    183183        document.getElementById('date').innerHTML = tinymce.releaseDate;
    184  
     184
    185185        if ( win.fullscreen && win.fullscreen.settings.visible ) {
    186186            d('content1').className = 'hidden';
    … …  
    191191        if ( tinymce.isMac )
    192192            document.body.className = 'macos';
    193        
     193
    194194        if ( tinymce.isMac && tinymce.isWebKit )
    195195            document.body.className = 'macos macwebkit';
Note: See TracChangeset for help on using the changeset viewer.