Changeset 15904

Timestamp:

10/21/2010 07:55:28 PM (16 years ago)

Author:

nacin

Message:

Pruning shears.

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/includes/default-list-tables.php (modified) (10 diffs)
• wp-admin/includes/list-table.php (modified) (2 diffs)
• wp-admin/js/theme.dev.js (modified) (2 diffs)
• wp-admin/network/menu.php (modified) (1 diff)
• wp-admin/theme-install.php (modified) (2 diffs)
• wp-admin/themes.php (modified) (1 diff)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/js/autosave.dev.js (modified) (1 diff)
• wp-includes/nav-menu-template.php (modified) (4 diffs)
• wp-includes/post.php (modified) (1 diff)
• wp-includes/taxonomy.php (modified) (2 diffs)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

trunk/wp-admin/admin.php

@@ -216 +216 @@
 } else {
         do_action("load-$pagenow");
-        // Backwards compatibility with old load-page-new.php, load-page.php, 
+        // Backwards compatibility with old load-page-new.php, load-page.php,
         // and load-categories.php actions.
         if ( $typenow == 'page' ) {

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

@@ -162 +162 @@
                         $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;
         }
@@ -999 +999 @@
                 if ( !current_user_can('upload_files') )
                         wp_die( __( 'You do not have permission to upload files.' ) );
-        }       
+        }
 
         function prepare_items() {
@@ -1489 +1489 @@
 
                 $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,
                 ) );
         }
@@ -1821 +1821 @@
 
                 $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,
                 ) );
         }
@@ -2567 +2567 @@
 
                 $this->items = get_bookmarks( $args );
-        }       
+        }
 
         function no_items() {
@@ -2728 +2728 @@
         }
 
-        function check_permissions() {  
+        function check_permissions() {
                 if ( ! current_user_can( 'manage_sites' ) )
                         wp_die( __( 'You do not have permission to access this page.' ) );
@@ -3049 +3049 @@
 
                 $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,
                 ) );
         }
@@ -3372 +3372 @@
                         uasort( $this->items, '_order_plugins_callback' );
                 }
-        
+
                 $plugins_per_page = $this->get_items_per_page( 'plugins_per_page', 999 );
 
@@ -3645 +3645 @@
         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.'));
         }
 
@@ -4086 +4086 @@
                 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' ) );
 

trunk/wp-admin/includes/list-table.php

@@ -149 +149 @@
                 if ( 'page' == $key )
                         return $this->get_pagenum();
-                        
+
                 if ( isset( $this->_pagination_args[$key] ) )
                         return $this->_pagination_args[$key];
@@ -263 +263 @@
                 if ( isset( $_REQUEST['action2'] ) && -1 != $_REQUEST['action2'] )
                         return $_REQUEST['action2'];
-        
+
                 return false;
         }

trunk/wp-admin/js/theme.dev.js

@@ -48 +48 @@
                                 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();
@@ -56 +56 @@
                         });
                 }
-        
+
                 // These are the functions we expose
                 var api = {

trunk/wp-admin/network/menu.php

@@ -27 +27 @@
 
 $plugin_update_count = $theme_update_count = $wordpress_update_count = 0;
-$update_plugins = get_site_transient( 'update_plugins' ); 
-if ( !empty($update_plugins->response) ) 
-        $plugin_update_count = count( $update_plugins->response ); 
+$update_plugins = get_site_transient( 'update_plugins' );
+if ( !empty($update_plugins->response) )
+        $plugin_update_count = count( $update_plugins->response );
 $menu[20] = array(sprintf( __('Plugins %s'), "<span class='update-plugins count-$plugin_update_count'><span class='plugin-count'>" . number_format_i18n($plugin_update_count) . "</span></span>" ), 'manage_network_plugins', 'plugins.php', '', 'menu-top menu-icon-plugins', 'menu-plugins', 'div');
 $submenu['plugins.php'][5]  = array( __('Plugins'), 'manage_network_plugins', 'plugins.php' );

trunk/wp-admin/theme-install.php

@@ -41 +41 @@
 <div class="wrap">
 <?php
-screen_icon(); 
+screen_icon();
 
 if ( is_network_admin() ) : ?>
@@ -48 +48 @@
 <h2><a href="themes.php" class="nav-tab"><?php echo esc_html_x('Manage Themes', 'theme'); ?></a><a href="theme-install.php" class="nav-tab nav-tab-active"><?php echo esc_html( $title ); ?></a></h2>
 
-<?php 
+<?php
 endif;
 

trunk/wp-admin/themes.php

@@ -147 +147 @@
         <?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>

trunk/wp-includes/canonical.php

@@ -343 +343 @@
         if ( !$redirect_url || $redirect_url == $requested_url )
                 return false;
-        
+
         // Hex encoded octets are case-insensitive.
         if ( false !== strpos($requested_url, '%') ) {

trunk/wp-includes/js/autosave.dev.js

@@ -261 +261 @@
         if ( jQuery("#post_author").size() )
                 post_data["post_author"] = jQuery("#post_author").val();
-        if ( jQuery("#parent_id").val() ) 
-                post_data["parent_id"] = jQuery("#parent_id").val(); 
+        if ( jQuery("#parent_id").val() )
+                post_data["parent_id"] = jQuery("#parent_id").val();
         post_data["user_ID"] = jQuery("#user-id").val();
         if ( jQuery('#auto_draft').val() == '1' )

trunk/wp-includes/nav-menu-template.php

@@ -315 +315 @@
 
         foreach ( (array) $menu_items as $key => $menu_item ) {
-        
+
                 $menu_items[$key]->current = false;
-        
+
                 $classes = (array) $menu_item->classes;
                 $classes[] = 'menu-item';
@@ -363 +363 @@
                         $item_url = untrailingslashit( strpos( $menu_item->url, '#' ) ? substr( $menu_item->url, 0, strpos( $menu_item->url, '#' ) ) : $menu_item->url );
                         $_indexless_current = untrailingslashit( preg_replace( '/index.php$/', '', $current_url ) );
-                
+
                         if ( in_array( $item_url, array( $current_url, $_indexless_current ) ) ) {
                                 $classes[] = 'current-menu-item';
@@ -384 +384 @@
                                 $active_object = $menu_item->object;
                         }
-                
+
                         if ( untrailingslashit($item_url) == home_url() )
                                 $classes[] = 'menu-item-home';
@@ -404 +404 @@
                 $menu_items[$key]->current_item_ancestor = false;
                 $menu_items[$key]->current_item_parent = false;
-        
+
                 if (
                         isset( $parent_item->type ) &&

trunk/wp-includes/post.php

@@ -1112 +1112 @@
  * @access private
  * @since 3.1.0
- */ 
+ */
 function _add_post_type_submenus() {
         foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {

trunk/wp-includes/taxonomy.php

@@ -504 +504 @@
                                         $term = $term->term_id;
                                 else
-                                        continue;                               
+                                        continue;
                         }
                         $children = array_merge( $children, get_term_children( $term, $taxonomy ) );
@@ -2832 +2832 @@
                 return apply_filters('get_ancestors', $ancestors, $object_id, $object_type);
         }
-        
+
         if ( is_taxonomy_hierarchical( $object_type ) ) {
                 $term = get_term($object_id, $object_type);

trunk/wp-includes/wp-db.php

@@ -1044 +1044 @@
 <p>If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href='http://wordpress.org/support/'>WordPress Support Forums</a>.</p>
 "/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' );
-                
+
                         //If show errors is disabled then we need to die anyway as we don't have a working DB connection
                         die();

trunk/wp-login.php

@@ -262 +262 @@
         if ( empty( $user ) )
                 return new WP_Error('invalid_key', __('Invalid key'));
-        
+
         return $user;
 }