Changeset 16438

Timestamp:

11/17/2010 06:47:34 PM (13 years ago)

Author:

ryan

Message:

Pinking shears

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (5 diffs)
• wp-admin/css/colors-classic.dev.css (modified) (1 diff)
• wp-admin/edit-comments.php (modified) (1 diff)
• wp-admin/edit-tags.php (modified) (1 diff)
• wp-admin/includes/class-wp-media-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-ms-sites-list-table.php (modified) (1 diff)
• wp-admin/includes/class-wp-ms-themes-list-table.php (modified) (10 diffs)
• wp-admin/includes/class-wp-plugins-list-table.php (modified) (2 diffs)
• wp-admin/includes/class-wp-posts-list-table.php (modified) (1 diff)
• wp-admin/includes/dashboard.php (modified) (2 diffs)
• wp-admin/includes/file.php (modified) (2 diffs)
• wp-admin/includes/list-table.php (modified) (1 diff)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/meta-boxes.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (2 diffs)
• wp-admin/js/list-table.dev.js (modified) (1 diff)
• wp-admin/media.php (modified) (1 diff)
• wp-admin/widgets.php (modified) (1 diff)
• wp-includes/admin-bar.php (modified) (10 diffs)
• wp-includes/class-wp-admin-bar.php (modified) (6 diffs)
• wp-includes/class-wp-http-ixr-client.php (modified) (3 diffs)
• wp-includes/class-wp-xmlrpc-server.php (modified) (4 diffs)
• wp-includes/class.wp-scripts.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (3 diffs)
• wp-includes/functions.php (modified) (3 diffs)
• wp-includes/l10n.php (modified) (1 diff)
• wp-includes/ms-admin-bar.php (modified) (2 diffs)
• wp-includes/ms-functions.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (5 diffs)
• wp-includes/post.php (modified) (4 diffs)
• wp-includes/query.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (3 diffs)
• wp-includes/taxonomy.php (modified) (2 diffs)

trunk/wp-admin/admin-ajax.php

@@ -724 +724 @@
     require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
-    // For performance reasons, we omit some object properties from the checklist.  
+    // For performance reasons, we omit some object properties from the checklist.
     // The following is a hacky way to restore them when adding non-custom items.
 
@@ -730 +730 @@
     foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
         if (
-            ! empty( $menu_item_data['menu-item-type'] ) && 
+            ! empty( $menu_item_data['menu-item-type'] ) &&
             'custom' != $menu_item_data['menu-item-type'] &&
             ! empty( $menu_item_data['menu-item-object-id'] )
@@ -740 +740 @@
 
                 case 'taxonomy' :
-                    $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] ); 
+                    $_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
                 break;
             }
 
-            $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) ); 
+            $_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
             $_menu_item = array_shift( $_menu_items );
 
@@ -750 +750 @@
             $menu_item_data['menu-item-description'] = $_menu_item->description;
         }
-        
+
         $menu_items_data[] = $menu_item_data;
-    }   
+    }
 
     $item_ids = wp_save_nav_menu_items( 0, $menu_items_data );
@@ -1078 +1078 @@
 
     wp_link_ajax( $_POST );
-    
+
     exit;
     break;

trunk/wp-admin/css/colors-classic.dev.css

@@ -1127 +1127 @@
 .folded #adminmenu li.wp-has-current-submenu,
 .folded #adminmenu li.menu-top.current {
-    background: #e0e0e0 url(../images/menu-bits-vs.gif?ver=20101102) top left repeat-x; 
-    border: #5589aa 1px solid; 
+    background: #e0e0e0 url(../images/menu-bits-vs.gif?ver=20101102) top left repeat-x;
+    border: #5589aa 1px solid;
     color: #464646;
 }

trunk/wp-admin/edit-comments.php

@@ -11 +11 @@
 if ( !current_user_can('edit_posts') )
     wp_die(__('Cheatin’ uh?'));
-            
+
 $wp_list_table = get_list_table('WP_Comments_List_Table');
 $wp_list_table->check_permissions();

trunk/wp-admin/edit-tags.php

@@ -12 +12 @@
 if ( !current_user_can( $tax->cap->manage_terms ) )
     wp_die( __( 'Cheatin’ uh?' ) );
-            
+
 $wp_list_table = get_list_table('WP_Terms_List_Table');
 $wp_list_table->check_permissions();

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

@@ -99 +99 @@
         if ( $this->detached ) {
             submit_button( __( 'Scan for lost attachments' ), 'secondary', 'find_detached', false );
-        } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) { 
+        } elseif ( $this->is_trash && current_user_can( 'edit_others_posts' ) ) {
             submit_button( __( 'Empty Trash' ), 'button-secondary apply', 'delete_all', false );
         } ?>

trunk/wp-admin/includes/class-wp-ms-sites-list-table.php

@@ -195 +195 @@
 
             $blogname = ( is_subdomain_install() ) ? str_replace( '.'.$current_site->domain, '', $blog['domain'] ) : $blog['path'];
-            
+
             list( $columns, $hidden ) = $this->get_column_info();
 

trunk/wp-admin/includes/class-wp-ms-themes-list-table.php

@@ -8 +8 @@
  */
 class WP_MS_Themes_List_Table extends WP_List_Table {
-    
+
     var $site_id;
     var $is_site_themes;
@@ -35 +35 @@
         ) );
     }
-    
+
     function check_permissions() {
         if ( is_multisite() ) {
@@ -46 +46 @@
         }
 
-        if ( $this->is_site_themes && !current_user_can('manage_sites') ) 
-            wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) ); 
-        else if ( !$this->is_site_themes && !current_user_can('manage_network_themes') ) 
+        if ( $this->is_site_themes && !current_user_can('manage_sites') )
+            wp_die( __( 'You do not have sufficient permissions to manage themes for this site.' ) );
+        else if ( !$this->is_site_themes && !current_user_can('manage_network_themes') )
             wp_die( __( 'You do not have sufficient permissions to manage network themes.' ) );
     }
@@ -65 +65 @@
         );
 
-        $site_allowed_themes = get_site_allowed_themes(); 
+        $site_allowed_themes = get_site_allowed_themes();
         if ( !$this->is_site_themes ) {
             $allowed_themes = $site_allowed_themes;
@@ -73 +73 @@
             $themes_per_page = $this->get_items_per_page( 'site_themes_network_per_page' );
         }
-        
+
         $current = get_site_transient( 'update_themes' );
 
@@ -90 +90 @@
                 $themes['upgrade'][$key] = $themes['all'][$key];
 
-            if ( $this->is_site_themes && isset( $site_allowed_themes[$theme_key] ) ) { 
-                unset( $themes['all'][$key] ); 
-                unset( $themes['enabled'][$key] ); 
-                unset( $themes['disabled'][$key] ); 
+            if ( $this->is_site_themes && isset( $site_allowed_themes[$theme_key] ) ) {
+                unset( $themes['all'][$key] );
+                unset( $themes['enabled'][$key] );
+                unset( $themes['disabled'][$key] );
             }
         }
@@ -132 +132 @@
         ) );
     }
-    
+
     function _search_callback( $theme ) {
         static $term;
@@ -212 +212 @@
             }
 
-            if ( $this->is_site_themes ) 
-                $url = 'site-themes.php?id=' . $this->site_id; 
-            else 
+            if ( $this->is_site_themes )
+                $url = 'site-themes.php?id=' . $this->site_id;
+            else
                 $url = 'themes.php';
 
@@ -237 +237 @@
         if ( current_user_can( 'update_themes' ) )
             $actions['update-selected'] = __( 'Update' );
-            
+
         return $actions;
     }
@@ -333 +333 @@
 
                     echo "</div></td>";
-                    break;  
+                    break;
                     break;
                 default:

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

@@ -258 +258 @@
 
         if ( 'active' != $status ) {
-            $action = $screen->is_network ? 'network-activate-selected' : 'activate-selected'; 
+            $action = $screen->is_network ? 'network-activate-selected' : 'activate-selected';
             $actions[ $action ] = __( 'Activate' );
         }
@@ -433 +433 @@
                     if ( ! empty( $plugin_data['PluginURI'] ) )
                         $plugin_meta[] = '<a href="' . $plugin_data['PluginURI'] . '" title="' . __( 'Visit plugin site' ) . '">' . __( 'Visit plugin site' ) . '</a>';
-    
+
                     $plugin_meta = apply_filters( 'plugin_row_meta', $plugin_meta, $plugin_file, $plugin_data, $status );
                     echo implode( ' | ', $plugin_meta );

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

@@ -667 +667 @@
             default:
             ?>
-            <td <?php echo $attributes ?>><?php 
+            <td <?php echo $attributes ?>><?php
                 if ( 'page' == $post->post_type )
                     do_action( 'manage_pages_custom_column', $column_name, $post->ID );

trunk/wp-admin/includes/dashboard.php

@@ -150 +150 @@
         $widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
     }
-    
+
     if ( is_blog_admin () )
         $side_widgets = array('dashboard_quick_press', 'dashboard_recent_drafts', 'dashboard_primary', 'dashboard_secondary');
@@ -422 +422 @@
     $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
     $blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
-    
+
     $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
 

trunk/wp-admin/includes/file.php

@@ -97 +97 @@
  * @since 1.5.0
  *
- * @uses get_home_path 
+ * @uses get_home_path
  * @uses WP_CONTENT_DIR full filesystem path to the wp-content directory
  * @param string $file filesystem path relative to the WordPress install directory or to the wp-content directory
@@ -255 +255 @@
  * @uses wp_upload_dir
  * @uses wp_unique_filename
- * @uses delete_transient   
+ * @uses delete_transient
  * @param array $file Reference to a single element of $_FILES. Call the function once for each uploaded file.
  * @param array $overrides Optional. An associative array of names=>values to override default variables with extract( $overrides, EXTR_OVERWRITE ).

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

@@ -18 +18 @@
 function get_list_table( $class ) {
     $class = apply_filters( "get_list_table_$class", $class );
-    
+
     require_list_table( $class );
 

trunk/wp-admin/includes/media.php

@@ -1120 +1120 @@
 
     $post = get_post( $attachment_id );
-    
+
     $default_args = array( 'errors' => null, 'send' => $post->post_parent ? post_type_supports( get_post_type( $post->post_parent ), 'editor' ) : true, 'delete' => true, 'toggle' => true, 'show_title' => true );
     $args = wp_parse_args( $args, $default_args );

trunk/wp-admin/includes/meta-boxes.php

@@ -156 +156 @@
 $post_formats = get_theme_support( 'post-formats' );
 
-if ( is_array( $post_formats[0] ) ) : 
+if ( is_array( $post_formats[0] ) ) :
     $post_format = get_post_format( $post->ID );
     if ( !$post_format )

trunk/wp-admin/includes/plugin.php

@@ -486 +486 @@
  * @param string $plugin Plugin path to main plugin file with plugin data.
  * @param string $redirect Optional. URL to redirect to.
- * @param bool $network_wide Whether to enable the plugin for all sites in the 
+ * @param bool $network_wide Whether to enable the plugin for all sites in the
  *   network or just the current site. Multisite only. Default is false.
  * @param bool $silent Prevent calling activation hooks. Optional, default is false.

trunk/wp-admin/includes/template.php

@@ -2120 +2120 @@
     endswitch;
     $text = ( NULL == $text ) ? __( 'Save Changes' ) : $text;
-    
+
     $attributes = '';
     if ( is_array( $other_attributes ) ) {
@@ -2129 +2129 @@
         $attributes = $other_attributes;
     }
-    
+
     // Default the id attribute to $name unless an id was specifically provided in $other_attributes
     $id = $name;
     if ( is_array( $other_attributes ) && isset( $other_attributes['id'] ) )
         $id = $other_attributes['id'];
-    
+
     $button = '<input type="submit" name="' . esc_attr( $name ) . '" id="' . esc_attr( $id ) . '" class="' . esc_attr( $class );
     $button .= '" value="' . esc_attr( $text ) . '" ' . $attributes . ' />';
-    
+
     if ( $wrap ) {
         $button = '<p class="submit">' . $button . '</p>';
     }
-    
+
     return $button;
 }

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

@@ -70 +70 @@
                 data[key] = '';
             else
-                data[key] = value;      
+                data[key] = value;
         });
 

trunk/wp-admin/media.php

@@ -67 +67 @@
     wp_enqueue_script('image-edit');
     wp_enqueue_style('imgareaselect');
-    
+
     add_contextual_help( $current_screen,
     '<p>' . __('This screen allows you to edit five fields for metadata in a file within the media library.') . '</p>' .

trunk/wp-admin/widgets.php

@@ -312 +312 @@
 <?php
     } else {
-        submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false ); 
+        submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
     }
     submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>

trunk/wp-includes/admin-bar.php

@@ -5 +5 @@
  * This code handles the building and rendering of the press bar.
  */
- 
+
 /**
  * Instantiate the admin bar object and set it up as a global for access elsewhere.
@@ -23 +23 @@
     /* Instantiate the admin bar */
     $admin_bar_class = apply_filters( 'wp_admin_bar_class', 'WP_Admin_Bar' );
-    if ( class_exists( $admin_bar_class ) ) 
+    if ( class_exists( $admin_bar_class ) )
         $wp_admin_bar = new $admin_bar_class;
     else
         return false;
-    
+
     $wp_admin_bar->initialize();
     $wp_admin_bar->add_menus();
@@ -61 +61 @@
 
     do_action( 'wp_after_admin_bar_render' );
-    
+
     $wp_admin_bar->unload_user_locale_translations();
 }
@@ -88 +88 @@
 
     $user_id = get_current_user_id();
-    
+
     if ( 0 != $user_id ) {
         /* Add the 'My Account' menu */
         $wp_admin_bar->add_menu( array( 'id' => 'my-account', 'title' => $user_identity,  'href' => get_edit_profile_url( $user_id ) ) );
-    
+
         /* Add the "My Account" sub menus */
         $wp_admin_bar->add_menu( array( 'parent' => 'my-account', 'title' => __( 'Edit My Profile' ), 'href' => get_edit_profile_url( $user_id ) ) );
@@ -158 +158 @@
 /**
  * Provide a shortlink.
- * 
+ *
  * @since 3.1.0
  */
@@ -172 +172 @@
 /**
  * Provide an edit link for posts and terms.
- * 
+ *
  * @since 3.1.0
  */
@@ -198 +198 @@
         if ( $ptype_obj->show_in_menu !== true || ! current_user_can( $ptype_obj->cap->edit_posts ) )
             continue;
-            
+
         $actions["post-new.php?post_type=$ptype"] = array( $ptype_obj->labels->singular_name, $ptype_obj->cap->edit_posts, "new-$ptype" );
     }
@@ -260 +260 @@
         $wordpress_update_count = 1;
     */
- 
+
     $update_count = $plugin_update_count + $theme_update_count + $wordpress_update_count;
 
@@ -298 +298 @@
     ?>
     <style type="text/css">
-        <?php 
-        
-        if ( 
-            ( empty( $_GET['nobump'] ) || is_admin() ) && 
-            ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' ) 
-        ) : 
+        <?php
+
+        if (
+            ( empty( $_GET['nobump'] ) || is_admin() ) &&
+            ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' )
+        ) :
             ?>
             body { padding-top: 28px !important; }
-            <?php 
-        endif; 
+            <?php
+        endif;
 
         if ( in_array( get_current_theme(), array('H3', 'H4', 'The Journalist v1.9') ) ) :
@@ -329 +329 @@
 function is_admin_bar_showing() {
     global $show_admin_bar;
-    
+
     /* For all these types of request we never want an admin bar period */
     if ( defined('XMLRPC_REQUEST') || defined('APP_REQUEST') || defined('DOING_AJAX') || defined('IFRAME_REQUEST') )
         return false;
-    
+
     if ( ! isset( $show_admin_bar ) || null === $show_admin_bar ) {
         if ( ! is_user_logged_in() || ( is_admin() && ! is_multisite() ) ) {

trunk/wp-includes/class-wp-admin-bar.php

@@ -14 +14 @@
 
         /* Set the protocol used throughout this code */
-        if ( is_ssl() ) 
+        if ( is_ssl() )
             $this->proto = 'https://';
 
@@ -98 +98 @@
             <div id="adminbarsearch-wrap">
                 <form action="<?php echo home_url(); ?>" method="get" id="adminbarsearch">
-                    <input class="adminbar-input" name="s" id="adminbar-search" type="text" title="<?php esc_attr_e( 'Search' ); ?>" value="" maxlength="150" /> 
+                    <input class="adminbar-input" name="s" id="adminbar-search" type="text" title="<?php esc_attr_e( 'Search' ); ?>" value="" maxlength="150" />
                     <button type="submit" class="adminbar-button"><span><?php _e('Search'); ?></span></button>
                 </form>
@@ -113 +113 @@
         <?php $menuclass = ( ! empty( $menu_item['children'] ) ) ? 'menupop ' : ''; ?>
 
-        <li class="<?php echo $menuclass . "ab-$id" ?><?php 
-            if ( ! empty( $menu_item['meta']['class'] ) ) : 
+        <li class="<?php echo $menuclass . "ab-$id" ?><?php
+            if ( ! empty( $menu_item['meta']['class'] ) ) :
                 echo ' ' . $menu_item['meta']['class'];
-            endif; 
+            endif;
         ?>">
-            <a href="<?php echo strip_tags( $menu_item['href'] ) ?>"<?php 
+            <a href="<?php echo strip_tags( $menu_item['href'] ) ?>"<?php
                 if ( ! empty( $menu_item['meta']['onclick'] ) ) :
-                    ?> onclick="<?php echo $menu_item['meta']['onclick']; ?>"<?php 
+                    ?> onclick="<?php echo $menu_item['meta']['onclick']; ?>"<?php
                 endif;
             if ( ! empty( $menu_item['meta']['target'] ) ) :
-                ?> target="<?php echo $menu_item['meta']['target']; ?>"<?php 
-            endif; 
-            
-            ?>><?php 
-            
-            if ( ! empty( $menuclass ) ) : 
-                ?><span><?php 
-            endif; 
-            
+                ?> target="<?php echo $menu_item['meta']['target']; ?>"<?php
+            endif;
+
+            ?>><?php
+
+            if ( ! empty( $menuclass ) ) :
+                ?><span><?php
+            endif;
+
             echo $menu_item['title'];
-            
-            if ( ! empty( $menuclass ) ) : 
-                ?></span><?php 
-            endif; 
-            
+
+            if ( ! empty( $menuclass ) ) :
+                ?></span><?php
+            endif;
+
             ?></a>
 
@@ -165 +165 @@
                 $this->add_node( $parent_id, $menu->{$id}['children'], $child );
         }
-        
+
         $child = null;
 
@@ -205 +205 @@
     function load_user_locale_translations() {
         $this->need_to_change_locale = ( get_locale() != $this->user->locale );
-        if ( ! $this->need_to_change_locale ) 
+        if ( ! $this->need_to_change_locale )
             return;
         /*
@@ -219 +219 @@
     function unload_user_locale_translations() {
         global $l10n;
-        if ( ! $this->changed_locale ) 
+        if ( ! $this->changed_locale )
             return;
         /*

trunk/wp-includes/class-wp-http-ixr-client.php

@@ -24 +24 @@
             }
         } else {
-            $this->scheme = 'http'; 
+            $this->scheme = 'http';
             $this->server = $server;
             $this->path = $path;
@@ -46 +46 @@
             'body'       => $xml,
         );
-        
+
         // Merge Custom headers ala #8145
         foreach ( $this->headers as $header => $value )
             $args['headers'][$header] = $value;
-        
+
         if ( $this->timeout !== false )
             $args['timeout'] = $this->timeout;
-            
+
         // Now send the request
         if ($this->debug) {
@@ -59 +59 @@
         }
 
-        $response = wp_remote_post($url, $args); 
+        $response = wp_remote_post($url, $args);
 
-        if ( is_wp_error($response) ) { 
-            $errno    = $response->get_error_code(); 
-            $errorstr = $response->get_error_message(); 
-            $this->error = new IXR_Error(-32300, "transport error: $errno $errstr"); 
+        if ( is_wp_error($response) ) {
+            $errno    = $response->get_error_code();
+            $errorstr = $response->get_error_message();
+            $this->error = new IXR_Error(-32300, "transport error: $errno $errstr");
             return false;
         }
-    
-        $code = $response['response']['code']; 
-        if ( $code != 200 ) { 
+
+        $code = $response['response']['code'];
+        if ( $code != 200 ) {
             $this->error = new IXR_Error(-32301, "transport error - HTTP status code was not 200 ($code)");             return false;
         }

trunk/wp-includes/class-wp-xmlrpc-server.php

@@ -1489 +1489 @@
      * @since 3.1.0
      *
-     * @param array $args Method parameters. Contains: 
+     * @param array $args Method parameters. Contains:
      *  - blog_id
      *  - username
      *  - password
      *  - attachment_id
-     * @return array. Assocciative array containing: 
+     * @return array. Assocciative array containing:
      *  - 'date_created_gmt'
      *  - 'parent'
@@ -1546 +1546 @@
     /**
      * Retrieves a collection of media library items (or attachments)
-     * 
-     * Besides the common blog_id, username, and password arguments, it takes a filter 
+     *
+     * Besides the common blog_id, username, and password arguments, it takes a filter
      * array as last argument.
-     * 
+     *
      * Accepted 'filter' keys are 'parent_id', 'mime_type', 'offset', and 'number'.
-     * 
+     *
      * The defaults are as follows:
      * - 'number' - Default is 5. Total number of media items to retrieve.
@@ -1557 +1557 @@
      * - 'parent_id' - Default is ''. The post where the media item is attached. Empty string shows all media items. 0 shows unattached media items.
      * - 'mime_type' - Default is ''. Filter by mime type (e.g., 'image/jpeg', 'application/pdf')
-     * 
+     *
      * @since 3.1.0
      *
@@ -1588 +1588 @@
         $offset = ( isset($struct['offset']) ) ? absint($struct['offset']) : 0 ;
         $number = ( isset($struct['number']) ) ? absint($struct['number']) : -1 ;
-        
+
         $attachments = get_posts( array('post_type' => 'attachment', 'post_parent' => $parent_id, 'offset' => $offset, 'numberposts' => $number, 'post_mime_type' => $mime_type ) );
         $num_attachments = count($attachments);

trunk/wp-includes/class.wp-scripts.php

@@ -186 +186 @@
         if ( 0 === strpos( $src, '/wp-includes/js/l10n' ) )
             return false;
-            
+
         foreach ( (array) $this->default_dirs as $test ) {
             if ( 0 === strpos($src, $test) )

trunk/wp-includes/comment.php

@@ -1765 +1765 @@
     include_once(ABSPATH . WPINC . '/class-IXR.php');
     include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
-    
+
     // original code by Mort (http://mort.mine.nu:8080)
     $post_links = array();

trunk/wp-includes/formatting.php

@@ -224 +224 @@
 /**
  * Newline preservation help function for wpautop
- * 
+ *
  * @since 3.1.0
  * @access private
@@ -738 +738 @@
  *
  * Removes tags, octets, entities, and if strict is enabled, will only keep
- * alphanumeric, _, space, ., -, @. After sanitizing, it passes the username, 
+ * alphanumeric, _, space, ., -, @. After sanitizing, it passes the username,
  * raw username (the username in the parameter), and the value of $strict as
  * parameters for the 'sanitize_user' filter.
@@ -1575 +1575 @@
 /**
  * Helper function to convert hex encoded chars to ascii
- * 
+ *
  * @since 3.1.0
  * @access private
  * @param $match the preg_replace_callback matches array
  */
-function _wp_iso_convert( $match ) { 
-    return chr( hexdec( strtolower( $match[1] ) ) ); 
-} 
+function _wp_iso_convert( $match ) {
+    return chr( hexdec( strtolower( $match[1] ) ) );
+}
 
 /**

trunk/wp-includes/functions.php

@@ -120 +120 @@
     }
     $timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
-    $timezone_formats_re = implode( '|', $timezone_formats );   
+    $timezone_formats_re = implode( '|', $timezone_formats );
     if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) && wp_timezone_supported() ) {
         $timezone_string = get_option( 'timezone_string' );
@@ -133 +133 @@
                     $dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
                 }
-            }           
+            }
         }
-    } 
+    }
     $j = @$datefunc( $dateformatstring, $i );
     // allow plugins to redo this entirely for languages with untypical grammars
@@ -1185 +1185 @@
 function do_enclose( $content, $post_ID ) {
     global $wpdb;
-    
+
     //TODO: Tidy this ghetto code up and make the debug code optional
     include_once( ABSPATH . WPINC . '/class-IXR.php' );

trunk/wp-includes/l10n.php

@@ -290 +290 @@
 /**
  * Translate the result of _n_noop() or _nx_noop()
- * 
+ *
  * @since 3.1
  * @param array $nooped_plural array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop()

trunk/wp-includes/ms-admin-bar.php

@@ -13 +13 @@
     /* Get the settings we need for the current site */
     $matureaction = $current_blog->mature ? 'unmatureblog' : 'matureblog';
-    $maturetext_confirm = $current_blog->mature ? 
-        sprintf( 
+    $maturetext_confirm = $current_blog->mature ?
+        sprintf(
             esc_attr__( 'Are you sure you want to unmark %s as mature?' ),
             $current_blog->domain
-        ) : 
+        ) :
         sprintf(
             esc_attr__( 'Are you sure you want to mark %s as mature?' ),
@@ -25 +25 @@
     $suspendaction = $current_blog->spam ? 'unspamblog' : 'spamblog';
     $suspendtext_confirm = $current_blog->spam ?
-        sprintf( 
+        sprintf(
             esc_attr__( 'Are you sure you want to unsuspend site %s?' ),
             $current_blog->domain
-        ) : 
+        ) :
         sprintf(
             esc_attr__( 'Are you sure you want to suspend site %s?' ),
             $current_blog->domain
         );
-        
+
     $mature_url = network_admin_url( "edit.php?action=confirm&action2={$matureaction}&id={$current_blog->blog_id}&msg=" . urlencode( $maturetext_confirm ) );
     $suspend_url = network_admin_url( "edit.php?action=confirm&action2={$suspendaction}&id={$current_blog->blog_id}&msg=" . urlencode( $suspendtext_confirm ) );

trunk/wp-includes/ms-functions.php

@@ -1375 +1375 @@
 function add_existing_user_to_blog( $details = false ) {
     global $blog_id;
-    
+
     if ( is_array( $details ) ) {
         $result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );

trunk/wp-includes/post-template.php

@@ -231 +231 @@
 /**
  * Preview fix for javascript bug with foreign languages
- * 
+ *
  * @since 3.1.0
  * @access private
@@ -238 +238 @@
  */
 function _convert_urlencoded_to_entities( $match ) {
-    return '&#' . base_convert( $match[1], 16, 10 ) . ';'; 
+    return '&#' . base_convert( $match[1], 16, 10 ) . ';';
 }
 
@@ -328 +328 @@
     $classes[] = 'type-' . $post->post_type;
     $classes[] = 'status-' . $post->post_status;
-    
+
     // Post Format
     $post_format = get_post_format( $post->ID );
@@ -340 +340 @@
     if ( post_password_required($post->ID) )
         $classes[] = 'post-password-required';
-    
+
     // sticky for Sticky Posts
     if ( is_sticky($post->ID) && is_home() && !is_paged() )
@@ -429 +429 @@
         $classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
         $classes[] = 'postid-' . $post_id;
-        
+
         // Post Format
         $post_format = get_post_format( $post->ID );

trunk/wp-includes/post.php

@@ -2274 +2274 @@
         $args = array( 'numberposts' => absint( $args ) );
     }
-    
+
     // Set default arguments
     $defaults = array(
@@ -3138 +3138 @@
         $curpage = $page;
         while ( $curpage->post_parent != 0 ) {
-            $post_parent = $curpage->post_parent; 
-            $curpage = wp_cache_get( $post_parent, 'posts' ); 
-            if ( false === $curpage ) 
+            $post_parent = $curpage->post_parent;
+            $curpage = wp_cache_get( $post_parent, 'posts' );
+            if ( false === $curpage )
                 $curpage = $wpdb->get_row( $wpdb->prepare( "SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE ID = %d and post_type = %s", $post_parent, $post_type ) );
             $path = '/' . $curpage->post_name . $path;
@@ -5242 +5242 @@
  * @since 3.1.0
  *
- * @return array The array of translations 
+ * @return array The array of translations
  */
 function get_post_format_strings() {
@@ -5261 +5261 @@
 /**
  * Returns a pretty, translated version of a post format slug
- * 
+ *
  * @since 3.1.0
  *

trunk/wp-includes/query.php

@@ -46 +46 @@
 /**
  * Retrieve ID of the current queried object. Wrapper for $wp_query->get_queried_object_id()
- * 
+ *
  * @uses WP_Query::get_queried_object_id()
  *

trunk/wp-includes/script-loader.php

@@ -62 +62 @@
     $scripts->add( 'l10n', "/wp-includes/js/l10n$suffix.js", false, '20101110' );
     $scripts->enqueue( 'l10n' );
-    
+
     $scripts->add( 'utils', "/wp-admin/js/utils$suffix.js", false, '20101110' );
 
@@ -261 +261 @@
 
     $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
-    $scripts->add_data( 'user-profile', 'group', 1 );   
+    $scripts->add_data( 'user-profile', 'group', 1 );
 
     $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20101117');
-    $scripts->add_data( 'admin-bar', 'group', 1 );  
+    $scripts->add_data( 'admin-bar', 'group', 1 );
     $scripts->localize( 'admin-bar', 'adminBarL10n', array(
         'url' => __( 'URL:' ),
         'noShortlink' => __( 'No shortlink available for this page.' ),
     ) );
-    
+
     if ( is_admin() ) {
         $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
@@ -502 +502 @@
     $styles->add( 'imgareaselect', '/wp-includes/js/imgareaselect/imgareaselect.css', array(), '0.9.1' );
     $styles->add( 'nav-menu', "/wp-admin/css/nav-menu$suffix.css", array(), '20100907' );
-    
+
     // Admin bar
     $styles->add( 'admin-bar', "/wp-includes/css/admin-bar$suffix.css", array(), '20101117' );

trunk/wp-includes/taxonomy.php

@@ -591 +591 @@
             // NOT IN is very slow for some reason
             $where .= " AND $primary_table.$primary_id_column IN (
-                SELECT object_id 
-                FROM $wpdb->term_relationships 
-                WHERE term_taxonomy_id $operator ($terms) 
-            )";         
+                SELECT object_id
+                FROM $wpdb->term_relationships
+                WHERE term_taxonomy_id $operator ($terms)
+            )";
         }
     }
@@ -1180 +1180 @@
         $$piece = isset( $clauses[ $piece ] ) ? $clauses[ $piece ] : '';
 
-    $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";    
+    $query = "SELECT $fields FROM $wpdb->terms AS t $join WHERE $where $orderby $order $limits";
 
     $fields = $_fields;