Changeset 19577

Timestamp:

12/08/2011 11:02:33 PM (15 years ago)

Author:

ryan

Message:

Pinking shears

Location:

trunk

Files:

• wp-admin/css/wp-admin-rtl.dev.css (modified) (1 diff)
• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-admin/network/site-themes.php (modified) (3 diffs)
• wp-admin/network/site-users.php (modified) (5 diffs)
• wp-admin/network/themes.php (modified) (4 diffs)
• wp-admin/network/user-new.php (modified) (2 diffs)
• wp-admin/network/users.php (modified) (2 diffs)
• wp-includes/js/tinymce/plugins/wpdialogs/js/popup.dev.js (modified) (2 diffs)
• wp-includes/js/tinymce/wp-mce-help.php (modified) (3 diffs)

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

@@ -1421 +1421 @@
 
 .about-wrap .feature-section .feature-images img {
-        margin-right: auto;     
+        margin-right: auto;
         margin-left: 5px;
 }

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

@@ -548 +548 @@
         if ( 'do-core-upgrade' != $action && 'do-core-reinstall' != $action )
                 return;
- 
+
         // Load the updated default text localization domain for new strings
         load_default_textdomain();

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

@@ -46 +46 @@
 
 // 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() );
 
@@ -82 +82 @@
                         $theme = $_GET['theme'];
                         $action = 'disabled';
-                        $n = 1;                 
+                        $n = 1;
                         if ( !$allowed_themes )
                                 $allowed_themes = array();
@@ -159 +159 @@
 
 if ( isset( $_GET['enabled'] ) ) {
-        $_GET['enabled'] = absint( $_GET['enabled'] ); 
-        echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>'; 
-} elseif ( isset( $_GET['disabled'] ) ) { 
-        $_GET['disabled'] = absint( $_GET['disabled'] ); 
-        echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>'; 
-} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) { 
-        echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>'; 
+        $_GET['enabled'] = absint( $_GET['enabled'] );
+        echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme enabled.', '%s themes enabled.', $_GET['enabled'] ), number_format_i18n( $_GET['enabled'] ) ) . '</p></div>';
+} elseif ( isset( $_GET['disabled'] ) ) {
+        $_GET['disabled'] = absint( $_GET['disabled'] );
+        echo '<div id="message" class="updated"><p>' . sprintf( _n( 'Theme disabled.', '%s themes disabled.', $_GET['disabled'] ), number_format_i18n( $_GET['disabled'] ) ) . '</p></div>';
+} elseif ( isset( $_GET['error'] ) && 'none' == $_GET['error'] ) {
+        echo '<div id="message" class="error"><p>' . __( 'No theme selected.' ) . '</p></div>';
 } ?>
 

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

@@ -37 +37 @@
 );
 
-$_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() );
 
@@ -67 +67 @@
 if ( $action ) {
         switch_to_blog( $id );
-        
+
         switch ( $action ) {
                 case 'newuser':
@@ -92 +92 @@
                         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 ) {
@@ -107 +107 @@
                         }
                         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'] ) ) {
@@ -152 +152 @@
                         break;
         }
-        
+
         restore_current_blog();
         wp_redirect( add_query_arg( 'update', $update, $referer ) );

trunk/wp-admin/network/themes.php

@@ -35 +35 @@
 
 if ( $action ) {
-        $allowed_themes = get_site_option( 'allowedthemes' );   
+        $allowed_themes = get_site_option( 'allowedthemes' );
         switch ( $action ) {
                 case 'enable':
@@ -129 +129 @@
                                         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 ) );
@@ -191 +191 @@
                         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;
@@ -229 +229 @@
 <?php screen_icon('themes'); ?>
 <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 }
-if ( $s ) 
-        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?> 
+if ( $s )
+        printf( '<span class="subtitle">' . __('Search results for &#8220;%s&#8221;') . '</span>', esc_html( $s ) ); ?>
 </h2>
 

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

@@ -42 +42 @@
         $user = $_POST['user'];
 
-        $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] ); 
+        $user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
         if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
                 $add_user_errors = $user_details[ 'errors' ];
@@ -87 +87 @@
         </div>
 <?php } ?>
-        <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">     
+        <form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post">
         <table class="form-table">
                 <tr class="form-field form-required">

trunk/wp-admin/network/users.php

@@ -212 +212 @@
                         wp_redirect( add_query_arg( array( 'updated' => 'true', 'action' => $deletefunction ), network_admin_url( 'users.php' ) ) );
                         exit();
-                break;  
+                break;
         }
 }
@@ -282 +282 @@
                 <a href="<?php echo network_admin_url('user-new.php'); ?>" class="add-new-h2"><?php echo esc_html_x( 'Add New', 'user' ); ?></a><?php
         endif;
-        
+
         if ( !empty( $usersearch ) )
         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

@@ -1 +1 @@
 /**
  * popup.js
- * 
+ *
  * An altered version of tinyMCEPopup to work in the same window as tinymce.
- * 
+ *
  * ------------------------------------------------------------------
  *
@@ -279 +279 @@
         },
 
-        // Internal functions   
+        // Internal functions
 
         _restoreSelection : function() {

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

@@ -144 +144 @@
                 display: table-row;
         }
-        
+
 </style>
 <?php if ( is_rtl() ) : ?>
@@ -182 +182 @@
                 document.getElementById('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
         document.getElementById('date').innerHTML = tinymce.releaseDate;
- 
+
                 if ( win.fullscreen && win.fullscreen.settings.visible ) {
                         d('content1').className = 'hidden';
@@ -191 +191 @@
                 if ( tinymce.isMac )
                         document.body.className = 'macos';
-                
+
                 if ( tinymce.isMac && tinymce.isWebKit )
                         document.body.className = 'macos macwebkit';