Pinking shears.

git-svn-id: https://develop.svn.wordpress.org/trunk@15843 602fd350-edb4-49c9-b593-d223f7449a82

wp-admin/admin.php

@@ -215,13 +215,13 @@ if ( isset($plugin_page) ) {
 	exit();
 } else {
 	do_action("load-$pagenow");
-	// Backwards compatibility with old load-page-new.php, load-page.php,   
-	// and load-categories.php actions.  
-	if ( $typenow == 'page' ) {  
-		if ( $pagenow == 'post-new.php' )  
-			do_action( 'load-page-new.php' );  
-		elseif ( $pagenow == 'post.php' )  
-			do_action( 'load-page.php' );  
+	// Backwards compatibility with old load-page-new.php, load-page.php, 
+	// and load-categories.php actions.
+	if ( $typenow == 'page' ) {
+		if ( $pagenow == 'post-new.php' )
+			do_action( 'load-page-new.php' );
+		elseif ( $pagenow == 'post.php' )
+			do_action( 'load-page.php' );
 	}  elseif ( $taxnow == 'category' && $pagenow == 'edit-tags.php' ) {
 		do_action( 'load-categories.php' );
 	}

wp-admin/css/nav-menu.dev.css

@@ -95,7 +95,7 @@ body {
 	#menu-management .menu-add-new abbr {
 		font-weight:bold;
 	}
-	
+
 #nav-menu-footer {
 	border-width: 0 1px 1px 1px;
 	-moz-border-radius-bottomleft: 6px;

wp-admin/custom-header.php

@@ -558,8 +558,8 @@ class Custom_Image_Header {
 </tbody>
 </table>
 	<?php endif;
-	
-do_action( 'custom_header_options' ); 
+
+do_action( 'custom_header_options' );
 
 wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 
@@ -644,7 +644,7 @@ wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
 	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $id ); ?>" />
 	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
 	<?php wp_nonce_field( 'custom-header-crop-image' ) ?>
-	
+
 	<?php submit_button( __( 'Crop and Publish' ) ); ?>
 	</p>
 </form>

wp-admin/includes/bookmark.php

@@ -120,7 +120,7 @@ function get_link_to_edit( $link_id ) {
 }
 
 /**
- * This function inserts/updates links into/in the database. 
+ * This function inserts/updates links into/in the database.
  *
  * @since 2.0.0
  *
@@ -221,7 +221,7 @@ function wp_insert_link( $linkdata, $wp_error = false ) {
  * @since 2.1.0
  *
  * @param int $link_id ID of link to update
- * @param array $link_categories Array of categories to 
+ * @param array $link_categories Array of categories to
  */
 function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
 	// If $link_categories isn't already an array, make it one:

wp-admin/includes/default-list-tables.php

@@ -85,7 +85,7 @@ class WP_Posts_Table extends WP_List_Table {
 		$total_items = $this->hierarchical_display ? $wp_query->post_count : $wp_query->found_posts;
 
 		$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
- 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type ); 
+ 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
 
 		if ( $this->hierarchical_display )
 			$total_pages = ceil( $total_items / $per_page );
@@ -161,7 +161,7 @@ class WP_Posts_Table extends WP_List_Table {
 
 			$status_links[$status_name] = "<li><a href='edit.php?post_status=$status_name&amp;post_type=$post_type'$class>" . sprintf( _n( $status->label_count[0], $status->label_count[1], $num_posts->$status_name ), number_format_i18n( $num_posts->$status_name ) ) . '</a>';
 		}
-		
+	
 		return $status_links;
 	}
 
@@ -735,11 +735,11 @@ class WP_Posts_Table extends WP_List_Table {
 			$authors_dropdown = '';
 
 			if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) :
-				$users_opt = array( 
-					'name' => 'post_author', 
-					'class'=> 'authors', 
-					'multi' => 1, 
-					'echo' => 0 
+				$users_opt = array(
+					'name' => 'post_author',
+					'class'=> 'authors',
+					'multi' => 1,
+					'echo' => 0
 				);
 				if ( $bulk )
 					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
@@ -998,7 +998,7 @@ class WP_Media_Table extends WP_List_Table {
 	function check_permissions() {
 		if ( !current_user_can('upload_files') )
 			wp_die( __( 'You do not have permission to upload files.' ) );
-	}		
+	}	
 
 	function prepare_items() {
 		global $lost, $wpdb, $wp_query, $post_mime_types, $avail_post_mime_types;
@@ -1488,10 +1488,10 @@ class WP_Terms_Table extends WP_List_Table {
 			$args['order'] = trim( stripslashes( $_REQUEST['order'] ) );
 
 		$this->callback_args = $args;
-		
+	
 		$this->set_pagination_args( array(
 			'total_items' => wp_count_terms( $taxonomy, compact( 'search' ) ),
-			'per_page' => $tags_per_page,		
+			'per_page' => $tags_per_page,	
 		) );
 	}
 
@@ -1677,7 +1677,7 @@ class WP_Terms_Table extends WP_List_Table {
 
 		return $out;
 	}
-	
+
 	function column_description( $tag ) {
 		return $tag->description;
 	}
@@ -1711,7 +1711,7 @@ class WP_Terms_Table extends WP_List_Table {
 
 	function column_default( $tag, $column_name ) {
 		global $taxonomy;
-	
+
 		return apply_filters( "manage_${taxonomy}_custom_column", '', $column_name, $tag->term_id );
 		$out .= "</td>";
 	}
@@ -1820,10 +1820,10 @@ class WP_Users_Table extends WP_List_Table {
 		$wp_user_search = new WP_User_Query( $args );
 
 		$this->items = $wp_user_search->get_results();
-		
+	
 		$this->set_pagination_args( array(
 			'total_items' => $wp_user_search->get_total(),
-			'per_page' => $users_per_page,		
+			'per_page' => $users_per_page,	
 		) );
 	}
 
@@ -1888,7 +1888,7 @@ class WP_Users_Table extends WP_List_Table {
 	</div>
 <?php
 	}
-	
+
 	function current_action() {
 		if ( isset($_REQUEST['changeit']) && !empty($_REQUEST['new_role']) )
 			return 'promote';
@@ -2563,7 +2563,7 @@ class WP_Links_Table extends WP_List_Table {
 			$args['order'] = $order;
 
 		$this->items = get_bookmarks( $args );
-	}		
+	}	
 
 	function no_items() {
 		_e( 'No links found.' );
@@ -2724,7 +2724,7 @@ class WP_Sites_Table extends WP_List_Table {
 		) );
 	}
 
-	function check_permissions() {		
+	function check_permissions() {	
 		if ( ! current_user_can( 'manage_sites' ) )
 			wp_die( __( 'You do not have permission to access this page.' ) );
 	}
@@ -3014,7 +3014,7 @@ class WP_MS_Users_Table extends WP_List_Table {
 	function check_permissions() {
 		if ( !is_multisite() )
 			wp_die( __( 'Multisite support is not enabled.' ) );
-	
+
 		if ( ! current_user_can( 'manage_network_users' ) )
 			wp_die( __( 'You do not have permission to access this page.' ) );
 	}
@@ -3045,10 +3045,10 @@ class WP_MS_Users_Table extends WP_List_Table {
 		$wp_user_search = new WP_User_Query( $args );
 
 		$this->items = $wp_user_search->get_results();
-		
+	
 		$this->set_pagination_args( array(
 			'total_items' => $wp_user_search->get_total(),
-			'per_page' => $users_per_page,		
+			'per_page' => $users_per_page,	
 		) );
 	}
 
@@ -3367,7 +3367,7 @@ class WP_Plugins_Table extends WP_List_Table {
 			}
 			uasort( $this->items, '_order_plugins_callback' );
 		}
-		
+	
 		$plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
 
 		$start = ( $page - 1 ) * $plugins_per_page;
@@ -3416,7 +3416,7 @@ class WP_Plugins_Table extends WP_List_Table {
 
 	function get_views() {
 		global $totals, $status;
-	
+
 		$status_links = array();
 		foreach ( $totals as $type => $count ) {
 			if ( !$count )
@@ -3452,7 +3452,7 @@ class WP_Plugins_Table extends WP_List_Table {
 					break;
 			}
 
-			$status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>", 
+			$status_links[$type] = sprintf( "<li><a href='%s' %s>%s</a>",
 				add_query_arg('plugin_status', $type, 'plugins.php'),
 				( $type == $status ) ? ' class="current"' : '',
 				sprintf( $text, number_format_i18n( $count ) )
@@ -3640,7 +3640,7 @@ class WP_Plugin_Install_Table extends WP_List_Table {
 
 	function check_permissions() {
 		if ( ! current_user_can('install_plugins') )
-			wp_die(__('You do not have sufficient permissions to install plugins on this site.'));		
+			wp_die(__('You do not have sufficient permissions to install plugins on this site.'));	
 	}
 
 	function prepare_items() {
@@ -4081,8 +4081,8 @@ class WP_Theme_Install_Table extends WP_List_Table {
 	function prepare_items() {
 		include( ABSPATH . 'wp-admin/includes/theme-install.php' );
 
-		global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;		
-		
+		global $tabs, $tab, $paged, $type, $term, $theme_field_defaults;	
+	
 		wp_reset_vars( array( 'tab' ) );
 
 		$paged = $this->get_pagenum();

wp-admin/includes/list-table.php

@@ -261,7 +261,7 @@ class WP_List_Table {
 
 		if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
 			return $_REQUEST['action2'];
-		
+	
 		return false;
 	}
 
@@ -398,7 +398,7 @@ class WP_List_Table {
 	 */
 	function get_pagenum( $query_var = 'paged' ) {
 		$pagenum = isset( $_REQUEST[$query_var] ) ? absint( $_REQUEST[$query_var] ) : 0;
-	
+
 		return max( 1, $pagenum );
 	}
 
@@ -409,7 +409,7 @@ class WP_List_Table {
 	 * @access protected
 	 *
 	 * @return int
-	 */	
+	 */
 	function get_items_per_page( $option, $default = 20 ) {
 		$per_page = (int) get_user_option( $option );
 		if ( empty( $per_page ) || $per_page < 1 )
@@ -621,7 +621,7 @@ class WP_List_Table {
 	 * @access protected
 	 *
 	 * @return array
-	 */	
+	 */
 	function get_table_classes() {
 		extract( $this->_args );
 

wp-admin/includes/meta-boxes.php

@@ -508,8 +508,8 @@ function post_author_meta_box($post) {
 ?>
 <label class="screen-reader-text" for="post_author_override"><?php _e('Author'); ?></label>
 <?php
-	wp_dropdown_users( array( 
-		'name' => 'post_author_override', 
+	wp_dropdown_users( array(
+		'name' => 'post_author_override',
 		'selected' => empty($post->ID) ? $user_ID : $post->post_author
 	) );
 }

wp-admin/includes/template.php

@@ -2072,7 +2072,7 @@ function set_current_screen( $id =  '' ) {
 
 	$current_screen->is_network = is_network_admin() ? true : false;
 	$current_screen->is_user = is_user_admin() ? true : false;
-	
+
 	if ( $current_screen->is_network ) {
 		$current_screen->base .= '-network';
 		$current_screen->id .= '-network';

wp-admin/js/list-table.dev.js

@@ -77,7 +77,7 @@ window.listTable = {
 		this._callback = callback;
 
 		this.fetch_list(
-			data, 
+			data,
 			$.proxy(this, 'handle_success'),
 			$.proxy(this, 'handle_error')
 		);

wp-admin/js/nav-menu.dev.js

@@ -918,7 +918,7 @@ var wpNavMenu;
 					takenIDs[newID] = true;
 					if ( newID != matched[1] ) {
 						$item.html( $item.html().replace(new RegExp(
-							'menu-item\\[' + matched[1] + '\\]', 'g'), 
+							'menu-item\\[' + matched[1] + '\\]', 'g'),
 							'menu-item[' + newID + ']'
 						) );
 					}

wp-admin/js/theme.dev.js

@@ -47,7 +47,7 @@ var ThemeViewer;
 				// Set the options
 				opts.search = $( 'input[name=s]' ).val();
 				opts.order  = document.location.href.match( /order=(\w*)/ ) ? document.location.href.match( /order=(\w*)/ )[1] : 'random';
-				
+			
 				$( '#availablethemes td' ).fadeTo( 500, 0.1, function() {
 					$( '#availablethemes td img' ).hide();
 				} );
@@ -55,7 +55,7 @@ var ThemeViewer;
 				return false;
 			});
 		}
-		
+	
 		// These are the functions we expose
 		var api = {
 			init: init
@@ -68,4 +68,4 @@ var ThemeViewer;
 jQuery( document ).ready( function($) {
 	theme_viewer = new ThemeViewer();
 	theme_viewer.init();
-});	
+});

wp-admin/network/edit.php

@@ -74,7 +74,7 @@ function confirm_delete_users( $users ) {
 			}
 		}
 	}
-	
+
 	submit_button( __('Confirm Deletion'), 'delete' );
 	?>
 	</form>

wp-admin/options-general.php

@@ -49,7 +49,7 @@ function add_js() {
 			$.post(ajaxurl, {
 					action: 'date_format_custom' == format.attr('name') ? 'date_format' : 'time_format',
 					date : format.val(),
-				}, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );	
+				}, function(d) { format.siblings('img').css('visibility','hidden'); format.siblings('.example').text(d); } );
 		});
 	});
 //]]>

wp-admin/themes.php

@@ -110,7 +110,7 @@ require_once('./admin-header.php');
 		}
 	}
 	echo implode ( ' | ', $options );
-	
+
 	if ( $ct->tags ) : ?>
 	<p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p>
 	<?php endif; ?>
@@ -146,7 +146,7 @@ if ( ! current_user_can( 'switch_themes' ) ) {
 
 	<?php foreach ( $feature_list as $feature_name => $features ) :
 			$feature_name = esc_html( $feature_name ); ?>
-		
+	
 		<div class="feature-container">
 			<div class="feature-name"><?php echo $feature_name ?></div>