Changeset 4953

Timestamp:

02/27/2007 03:24:54 PM (18 years ago)

Author:

markjaquith

Message:

trailing tabs and whitespace cleanup.

Location:

trunk

Files:

• app.php (modified) (20 diffs)
• wp-admin/admin-ajax.php (modified) (1 diff)
• wp-admin/admin-functions.php (modified) (9 diffs)
• wp-admin/custom-header.php (modified) (4 diffs)
• wp-admin/import/blogger.php (modified) (7 diffs)
• wp-admin/import/greymatter.php (modified) (4 diffs)
• wp-admin/link-import.php (modified) (3 diffs)
• wp-admin/menu.php (modified) (2 diffs)
• wp-admin/options.php (modified) (2 diffs)
• wp-admin/page.php (modified) (1 diff)
• wp-admin/post.php (modified) (2 diffs)
• wp-admin/upgrade-schema.php (modified) (1 diff)
• wp-admin/upload-functions.php (modified) (3 diffs)
• wp-admin/upload-js.php (modified) (2 diffs)
• wp-includes/bookmark-template.php (modified) (1 diff)
• wp-includes/bookmark.php (modified) (1 diff)
• wp-includes/cache.php (modified) (2 diffs)
• wp-includes/category-template.php (modified) (1 diff)
• wp-includes/classes.php (modified) (6 diffs)
• wp-includes/cron.php (modified) (3 diffs)
• wp-includes/feed-atom-comments.php (modified) (3 diffs)
• wp-includes/feed-atom.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/general-template.php (modified) (1 diff)
• wp-includes/gettext.php (modified) (1 diff)
• wp-includes/js/autosave-js.php (modified) (6 diffs)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post-template.php (modified) (1 diff)
• wp-includes/post.php (modified) (4 diffs)
• wp-includes/query.php (modified) (12 diffs)
• wp-includes/theme.php (modified) (3 diffs)
• wp-includes/wp-db.php (modified) (4 diffs)
• wp-login.php (modified) (2 diffs)
• xmlrpc.php (modified) (1 diff)

trunk/app.php

@@ -24 +24 @@
 
     $_SERVER['PATH_INFO'] = $action;
-    
+
     if ($eid) {
         $_SERVER['PATH_INFO'] .= "/$eid";
@@ -174 +174 @@
             array_push($this->entry->categories, $attrs);
         }
-        
+
         $this->ns_decls = array();
     }
@@ -202 +202 @@
 
         array_shift($this->ns_contexts);
-        
+
         #print str_repeat(" ", $this->depth * $this->indent) . "end_element('$name')" ."\n";
 
@@ -343 +343 @@
                 } else {
                     // only allow what we have handlers for...
-                    $this->not_allowed(array_keys($funcs)); 
+                    $this->not_allowed(array_keys($funcs));
                 }
             }
@@ -454 +454 @@
 
     function put_post($postID) {
-        
+
         // checked for valid content-types (atom+xml)
         // quick check and exit
@@ -509 +509 @@
             $this->auth_required('Sorry, you do not have the right to delete this post.');
         }
-        
+
         if ($entry['post_type'] == 'attachment') {
-            $this->delete_attachment($postID);      
+            $this->delete_attachment($postID);
         } else {
             $result = wp_delete_post($postID);
@@ -524 +524 @@
 
     }
-    
+
     function get_attachment($postID = NULL) {
 
@@ -552 +552 @@
         }
         fclose($fp);
-        
+
         $slug = '';
         if ( isset( $_SERVER['HTTP_SLUG'] ) )
@@ -565 +565 @@
 
         log_app('wp_upload_bits returns:',print_r($file,true));
-        
+
         $url = $file['url'];
         $file = $file['file'];
@@ -719 +719 @@
         fclose($fp);
         fclose($localfp);
-    
+
         log_app('function',"put_file($postID)");
         $this->ok();
@@ -761 +761 @@
         echo $url;
     }
-    
+
     function get_attachments_url($page = NULL) {
         global $use_querystring;
@@ -791 +791 @@
             $postID = $GLOBALS['post']->ID;
         }
-        
+
         if ($use_querystring) {
             $url = get_bloginfo('url') . '/' . $this->script_name . '?action=/' . $this->ENTRY_PATH . "&eid=$postID";
@@ -813 +813 @@
             $postID = $GLOBALS['post']->ID;
         }
-        
+
         if ($use_querystring) {
             $url = get_bloginfo('url') . '/' . $this->script_name . '?action=/' . $this->MEDIA_SINGLE_PATH ."&eid=$postID";
@@ -874 +874 @@
         }
         $page = (int) $page;
-        
-        $count = get_option('posts_per_rss');   
+
+        $count = get_option('posts_per_rss');
         $query = "paged=$page&posts_per_page=$count&order=DESC";
         if($post_type == 'attachment') {
@@ -888 +888 @@
         $blog_id = $GLOBALS['blog_id'];
         $post_cache = $GLOBALS['post_cache'];
-        
+
 
         $total_count = $this->get_posts_count();
@@ -1057 +1057 @@
         exit;
     }
-    
+
     function not_found() {
         log_app('Status','404: Not Found');
@@ -1078 +1078 @@
         exit;
     }
-    
+
     function created($post_ID, $content, $post_type = 'post') {
         global $use_querystring;
@@ -1152 +1152 @@
         $login_data = array();
         $already_md5 = false;
-        
+
         log_app("authenticate()",print_r($_ENV, true));
 
@@ -1210 +1210 @@
 
     function process_conditionals() {
-        
+
         if(empty($this->params)) return;
         if($_SERVER['REQUEST_METHOD'] == 'DELETE') return;
@@ -1241 +1241 @@
         $client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
 
-        // Make a timestamp for our most recent modification... 
+        // Make a timestamp for our most recent modification...
         $wp_modified_timestamp = strtotime($wp_last_modified);
 

trunk/wp-admin/admin-ajax.php

@@ -227 +227 @@
     $_POST['post_category'] = explode(",", $_POST['catslist']);
     if($_POST['post_type'] == 'page' || empty($_POST['post_category']))
-        unset($_POST['post_category']); 
-    
+        unset($_POST['post_category']);
+
     if($_POST['post_ID'] < 0) {
         $_POST['temp_ID'] = $_POST['post_ID'];

trunk/wp-admin/admin-functions.php

@@ -682 +682 @@
             // No selected categories, strange
             $checked_categories[] = $default;
-        }   
+        }
     } else {
         $checked_categories[] = $default;
@@ -738 +738 @@
             // No selected categories, strange
             $checked_categories[] = $default;
-        }   
+        }
     } else {
         $checked_categories[] = $default;
@@ -779 +779 @@
         $output = ob_get_contents();
         ob_end_clean();
-        
+
         $output = apply_filters('cat_rows', $output);
 
@@ -1317 +1317 @@
     if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$parent][$plugin_page] ) )
         return false;
-    
+
     if ( empty( $parent) ) {
         if ( isset( $_wp_menu_nopriv[$pagenow] ) )
@@ -1329 +1329 @@
                 return false;
             if ( isset( $plugin_page ) && isset( $_wp_submenu_nopriv[$key][$plugin_page] ) )
-            return false;   
+            return false;
         }
         return true;
@@ -1451 +1451 @@
                     $parent_file = $_wp_real_parent_file[$parent_file];
             return $parent_file;
-        }           
+        }
     }
 
@@ -1458 +1458 @@
         if ( isset( $_wp_real_parent_file[$parent_file] ) )
             $parent_file = $_wp_real_parent_file[$parent_file];
-        return $parent_file;        
+        return $parent_file;
     }
 
@@ -1898 +1898 @@
     // Compute the URL
     $url = $uploads['url'] . "/$filename";
-    
+
     $return = apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $type ) );
 
@@ -2057 +2057 @@
     wp_clearcookie();
     // Set cookies for new paths.
-    wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));    
+    wp_setcookie( $user_login, $user_pass_md5, true, get_option( 'home' ), get_option( 'siteurl' ));
 }
 

trunk/wp-admin/custom-header.php

@@ -18 +18 @@
     function js_includes() {
         wp_enqueue_script('cropper');
-        wp_enqueue_script('colorpicker');   
+        wp_enqueue_script('colorpicker');
     }
 
@@ -116 +116 @@
         pickColor('<?php echo HEADER_TEXTCOLOR; ?>');
     }
-    
+
     function hide_text() {
         $('name').style.display = 'none';
@@ -127 +127 @@
         Event.observe( $('hidetext'), 'click', show_text );
     }
-    
+
     function show_text() {
         $('name').style.display = 'block';
@@ -135 +135 @@
         $('textcolor').value = '<?php echo HEADER_TEXTCOLOR; ?>';
         $('hidetext').value = '<?php _e('Hide Text'); ?>';
-        Event.stopObserving( $('hidetext'), 'click', show_text );   
+        Event.stopObserving( $('hidetext'), 'click', show_text );
         Event.observe( $('hidetext'), 'click', hide_text );
     }

trunk/wp-admin/import/blogger.php

@@ -56 +56 @@
         }
         $this->token = $matches[1];
-        
+
         wp_redirect( remove_query_arg( array( 'token', 'noheader' ) ) );
     }
@@ -370 +370 @@
                 if ( ! $sock ) return; // TODO: Error handling
                 $response = $this->_txrx( $sock, $request );
-    
+
                 $response = $this->parse_response( $response );
-    
+
                 // Extract the entries and send for insertion
                 preg_match_all( '/<entry[^>]*>.*?<\/entry>/s', $response['body'], $matches );
@@ -438 +438 @@
                         $entry = "<feed>$entry</feed>";
                         $AtomParser = new AtomParser();
-                        $AtomParser->parse( $entry );   
+                        $AtomParser->parse( $entry );
                         $this->import_comment($AtomParser->entry);
                         unset($AtomParser);
@@ -624 +624 @@
             $options .= "<option value='$user->user_id'$sel>$user->display_name</option>";
         }
-        
+
         return $options;
     }
@@ -707 +707 @@
         global $wpdb;
         $options = get_option( 'blogger_importer' );
-        
+
         if ( isset( $options['token'] ) )
             $this->revoke( $options['token'] );
@@ -923 +923 @@
             array_push($this->entry->categories, $attrs['term']);
         }
-        
+
         $this->ns_decls = array();
     }
@@ -951 +951 @@
 
         array_shift($this->ns_contexts);
-        
+
         #print str_repeat(" ", $this->depth * $this->indent) . "end_element('$name')" ."\n";
 

trunk/wp-admin/import/greymatter.php

@@ -92 +92 @@
         if (!chdir($gmpath))
             wp_die(sprintf(__("Wrong path, %s\ndoesn't exist\non the server"), $gmpath));
-            
+
         $this->header();
 ?>
@@ -129 +129 @@
         $user_id = wp_insert_user($user_info);
         $this->gmnames[$userdata[0]] = $user_id;
-        
+
         printf('<li>'.__('user %s...').' <strong>'.__('Done').'</strong></li>', "<em>$user_login</em>");
     }
@@ -214 +214 @@
                     $user_url=$wpdb->escape("");
                     $user_joindate=$wpdb->escape($user_joindate);
-                    
+
                     $user_info = array("user_login"=>$user_login, "user_pass"=>$pass1, "user_nickname"=>$user_nickname, "user_email"=>$user_email, "user_url"=>$user_url, "user_ip"=>$user_ip, "user_domain"=>$user_domain, "user_browser"=>$user_browser, "dateYMDhour"=>$user_joindate, "user_level"=>0, "user_idmode"=>"nickname");
                     $user_id = wp_insert_user($user_info);
                     $this->gmnames[$postinfo[1]] = $user_id;
-                    
+
                     echo ': ';
                     printf(__('registered deleted user %s at level 0 '), "<em>$user_login</em>");
                 }
-            
+
                 if (array_key_exists($postinfo[1], $this->gmnames)) {
                     $post_author = $this->gmnames[$postinfo[1]];
@@ -228 +228 @@
                     $post_author = $user_id;
                 }
-            
+
                 $postdata = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_modified', 'post_modified_gmt');
                 $post_ID = wp_insert_post($postdata);

trunk/wp-admin/link-import.php

@@ -13 +13 @@
 <?php
 switch ($step) {
-    case 0:
-    {
-        include_once('admin-header.php');
-        if ( !current_user_can('manage_links') )
-            wp_die(__('Cheatin&#8217; uh?'));
+    case 0: {
+        include_once('admin-header.php');
+        if ( !current_user_can('manage_links') )
+            wp_die(__('Cheatin&#8217; uh?'));
 
-        $opmltype = 'blogrolling'; // default.
+        $opmltype = 'blogrolling'; // default.
 ?>
 
 <div class="wrap">
+
 <h2><?php _e('Import your blogroll from another system') ?> </h2>
 <form enctype="multipart/form-data" action="link-import.php" method="post" name="blogroll">
@@ -40 +40 @@
 <input id="userfile" name="userfile" type="file" size="30" />
 </div>
-
 
 </div>
@@ -61 +60 @@
 </div>
 <?php
-                break;
-            } // end case 0
+        break;
+    } // end case 0
 
-    case 1: {
+    case 1: {
         check_admin_referer('import-bookmarks');
 
-                include_once('admin-header.php');
-                if ( !current_user_can('manage_links') )
-                    wp_die(__('Cheatin&#8217; uh?'));
+        include_once('admin-header.php');
+        if ( !current_user_can('manage_links') )
+            wp_die(__('Cheatin&#8217; uh?'));
 ?>
 <div class="wrap">
 
-     <h2><?php _e('Importing...') ?></h2>
+<h2><?php _e('Importing...') ?></h2>
 <?php
-                $cat_id = $_POST['cat_id'];
-                if (($cat_id == '') || ($cat_id == 0)) {
-                    $cat_id  = 1;
-                }
+        $cat_id = $_POST['cat_id'];
+        if ( $cat_id == '' || $cat_id == 0 )
+            $cat_id  = 1;
 
-                $opml_url = $_POST['opml_url'];
-                if (isset($opml_url) && $opml_url != '' && $opml_url != 'http://') {
-                    $blogrolling = true;
-                }
-                else // try to get the upload file.
-                {
-                    $overrides = array('test_form' => false, 'test_type' => false);
-                    $file = wp_handle_upload($_FILES['userfile'], $overrides);
+        $opml_url = $_POST['opml_url'];
+        if ( isset($opml_url) && $opml_url != '' && $opml_url != 'http://' ) {
+            $blogrolling = true;
+        } else { // try to get the upload file.
+            $overrides = array('test_form' => false, 'test_type' => false);
+            $file = wp_handle_upload($_FILES['userfile'], $overrides);
 
-                    if ( isset($file['error']) )
-                        wp_die($file['error']);
+            if ( isset($file['error']) )
+                wp_die($file['error']);
 
-                    $url = $file['url'];
-                    $opml_url = $file['file'];
-                    $blogrolling = false;
-                }
+            $url = $file['url'];
+            $opml_url = $file['file'];
+            $blogrolling = false;
+        }
 
-                if (isset($opml_url) && $opml_url != '') {
-                    $opml = wp_remote_fopen($opml_url);
-                    include_once('link-parse-opml.php');
+        if ( isset($opml_url) && $opml_url != '' ) {
+            $opml = wp_remote_fopen($opml_url);
+            include_once('link-parse-opml.php');
 
-                    $link_count = count($names);
-                    for ($i = 0; $i < $link_count; $i++) {
-                        if ('Last' == substr($titles[$i], 0, 4))
-                            $titles[$i] = '';
-                        if ('http' == substr($titles[$i], 0, 4))
-                            $titles[$i] = '';
-                        $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);                       
-                        wp_insert_link($link);
-                        echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
-                    }
+            $link_count = count($names);
+            for ( $i = 0; $i < $link_count; $i++ ) {
+                if ('Last' == substr($titles[$i], 0, 4))
+                    $titles[$i] = '';
+                if ( 'http' == substr($titles[$i], 0, 4) )
+                    $titles[$i] = '';
+                $link = array( 'link_url' => $urls[$i], 'link_name' => $wpdb->escape($names[$i]), 'link_category' => array($cat_id), 'link_description' => $wpdb->escape($descriptions[$i]), 'link_owner' => $user_ID, 'link_rss' => $feeds[$i]);
+                wp_insert_link($link);
+                echo sprintf('<p>'.__('Inserted <strong>%s</strong>').'</p>', $names[$i]);
+            }
 ?>
-     <p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+
+<p><?php printf(__('Inserted %1$d links into category %2$s. All done! Go <a href="%3$s">manage those links</a>.'), $link_count, $cat_id, 'link-manager.php') ?></p>
+
 <?php
-                } // end if got url
-                else
-                {
-                    echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
-                } // end else
+} // end if got url
+else
+{
+    echo "<p>" . __("You need to supply your OPML url. Press back on your browser and try again") . "</p>\n";
+} // end else
 
-                if ( ! $blogrolling )
-                    @unlink($opml_url);
+if ( ! $blogrolling )
+    @unlink($opml_url);
 ?>
 </div>
 <?php
-                break;
-            } // end case 1
+        break;
+    } // end case 1
 } // end switch
 

trunk/wp-admin/menu.php

@@ -15 +15 @@
 else
     $menu[10] = array(__('Manage'), 'edit_posts', 'edit.php');
-    
+
 $menu[15] = array(__('Comments'), 'edit_posts', 'edit-comments.php');
 $menu[20] = array(__('Blogroll'), 'manage_links', 'link-manager.php');
@@ -105 +105 @@
         $_wp_real_parent_file[$old_parent] = $new_parent;
         $menu[$id][2] = $new_parent;
-        
+
         foreach ($submenu[$old_parent] as $index => $data) {
             $submenu[$new_parent][$index] = $submenu[$old_parent][$index];

trunk/wp-admin/options.php

@@ -79 +79 @@
     }
 
-    return $value;  
+    return $value;
 }
 
@@ -151 +151 @@
     if (stristr($value, "\n")) echo "<textarea class='$class' name='$option->option_name' id='$option->option_name' cols='30' rows='5'>$value</textarea>";
     else echo "<input class='$class' type='text' name='$option->option_name' id='$option->option_name' size='30' value='" . $value . "'$disabled />";
-    
+
     echo "</td>
     <td>$option->option_description</td>

trunk/wp-admin/page.php

@@ -108 +108 @@
 
         if ( isset($_POST['save']) )
-            $location = "page.php?action=edit&post=$page_ID";       
+            $location = "page.php?action=edit&post=$page_ID";
     } else {
         if ($_POST['save']) {

trunk/wp-admin/post.php

@@ -48 +48 @@
     $post_ID = $p = (int) $_GET['post'];
     $post = get_post($post_ID);
-    
+
     if ( 'page' == $post->post_type ) {
         wp_redirect("page.php?action=edit&post=$post_ID");
@@ -120 +120 @@
             $referredby = preg_replace('|https?://[^/]+|i', '', $_POST['referredby']);
         $referer = preg_replace('|https?://[^/]+|i', '', wp_get_referer());
-    
+
         if ($_POST['save']) {
             $location = "post.php?action=edit&post=$post_ID";

trunk/wp-admin/upgrade-schema.php

@@ -3 +3 @@
 
 $charset_collate = '';
-    
+
 if ( version_compare(mysql_get_server_info(), '4.1.0', '>=') ) {
     if ( ! empty($wpdb->charset) )
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
     if ( ! empty($wpdb->collate) )
-        $charset_collate .= " COLLATE $wpdb->collate";  
+        $charset_collate .= " COLLATE $wpdb->collate";
 }
 

trunk/wp-admin/upload-functions.php

@@ -14 +14 @@
     if ( isset($attachment_data['width']) )
         list($width,$height) = wp_shrink_dimensions($attachment_data['width'], $attachment_data['height'], 171, 128);
-        
+
     ob_start();
         the_title();
@@ -20 +20 @@
     ob_end_clean();
     $post_content = apply_filters( 'content_edit_pre', $post->post_content );
-    
+
     $class = 'text';
     $innerHTML = get_attachment_innerHTML( $id, false, $dims );
@@ -286 +286 @@
     global $wpdb, $action, $paged;
     $old_vars = compact( 'paged' );
-    
+
     switch ( $action ) :
     case 'edit' :

trunk/wp-admin/upload-js.php

@@ -190 +190 @@
             new Insertion.Top('upload-content', h);
             if (e) Event.stop(e);
-            return false;       
+            return false;
         },
 
@@ -265 +265 @@
             return false;
         }
-            
+
     };
     theFileList.initializeVars();

trunk/wp-includes/bookmark-template.php

@@ -343 +343 @@
         //output one single list using title_li for the title
         $bookmarks = get_bookmarks("limit=$limit&category=$category&show_updated=$show_updated&orderby=$orderby&order=$order&hide_invisible=$hide_invisible&show_updated=$show_updated");
-        
+
         if ( !empty($bookmarks) ) {
             if ( !empty( $title_li ) ){

trunk/wp-includes/bookmark.php

@@ -73 +73 @@
     if (!empty($exclusions))
         $exclusions .= ')';
-        
+
     if ( ! empty($category_name) ) {
         if ( $cat_id = $wpdb->get_var("SELECT cat_ID FROM $wpdb->categories WHERE cat_name='$category_name' LIMIT 1") )

trunk/wp-includes/cache.php

@@ -387 +387 @@
         return $this->__construct();
     }
-    
+
     function __construct() {
         global $blog_id;
@@ -430 +430 @@
     function __destruct() {
         $this->save();
-        return true;    
+        return true;
     }
 }

trunk/wp-includes/category-template.php

@@ -248 +248 @@
     } else {
         global $wp_query;
-        
+
         if ( is_category() )
             $r['current_category'] = $wp_query->get_queried_object_id();

trunk/wp-includes/classes.php

@@ -415 +415 @@
                     $output = call_user_func_array(array(&$this, 'start_el'), $cb_args);
                 }
-    
+
                 // End the element.
                 if ( isset($element->$id_field) && $element->$id_field != 0 ) {
@@ -421 +421 @@
                     $output = call_user_func_array(array(&$this, 'end_el'), $cb_args);
                 }
-    
-                continue;   
-            }
-    
+
+                continue;
+            }
+
             // Walk the tree.
             if ( !empty($previous_element) && ($element->$parent_field == $previous_element->$id_field) ) {
@@ -513 +513 @@
 
         $output .= $indent . '<li class="' . $css_class . '"><a href="' . get_page_link($page->ID) . '" title="' . attribute_escape($page->post_title) . '">' . $page->post_title . '</a>';
-    
+
         if ( !empty($show_date) ) {
             if ( 'modified' == $show_date )
@@ -519 +519 @@
             else
                 $time = $page->post_date;
-    
+
             $output .= " " . mysql2date($date_format, $time);
         }
@@ -525 +525 @@
         return $output;
     }
-    
+
     function end_el($output, $page, $depth) {
         $output .= "</li>\n";
@@ -614 +614 @@
                 $link .= ')';
         }
-    
+
         if ( isset($show_count) && $show_count )
             $link .= ' (' . intval($category->category_count) . ')';
-    
+
         if ( isset($show_date) && $show_date ) {
             $link .= ' ' . gmdate('Y-m-d', $category->last_update_timestamp);

trunk/wp-includes/cron.php

@@ -55 +55 @@
 function wp_clear_scheduled_hook( $hook ) {
     $args = array_slice( func_get_args(), 1 );
-    
+
     while ( $timestamp = wp_next_scheduled( $hook, $args ) )
         wp_unschedule_event( $timestamp, $hook, $args );
@@ -74 +74 @@
 function spawn_cron() {
     $crons = _get_cron_array();
-    
+
     if ( !is_array($crons) )
         return;
-    
+
     $keys = array_keys( $crons );
     if ( array_shift( $keys ) > time() )
@@ -99 +99 @@
 
     $crons = _get_cron_array();
-    
+
     if ( !is_array($crons) )
         return;

trunk/wp-includes/feed-atom-comments.php

@@ -17 +17 @@
     ?></title>
     <subtitle type="text"><?php bloginfo_rss('description'); ?></subtitle>
-    
+
     <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastcommentmodified('GMT')); ?></updated>
     <generator uri="http://wordpress.org/" version="<?php bloginfo('version'); ?>">WordPress</generator>
-    
+
     <link rel="alternate" type="<?php bloginfo_rss('html_type'); ?>" content="<?php bloginfo_rss('home'); ?>" />
     <link rel="self" type="application/atom+xml" href="<?php bloginfo_rss('comments_atom_url'); ?>" />
@@ -42 +42 @@
         ?></title>
         <link rel="alternate" href="<?php comment_link(); ?>" type="<?php bloginfo_rss('content_type'); ?>" />
-        
+
         <author>
             <name><?php comment_author_rss(); ?></name>
@@ -48 +48 @@
 
         </author>
-        
+
         <id><?php comment_link(); ?></id>
         <updated><?php echo mysql2date('D, d M Y H:i:s +0000', get_comment_time('Y-m-d H:i:s', true), false); ?></updated>

trunk/wp-includes/feed-atom.php

@@ -14 +14 @@
     <title type="text"><?php bloginfo_rss('name') ?></title>
     <subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
-    
+
     <updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
     <generator uri="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>

trunk/wp-includes/formatting.php

@@ -22 +22 @@
 
     $dynamic_characters = array('/\'(\d\d(?:’|\')?s)/', '/(\s|\A|")\'/', '/(\d+)"/', '/(\d+)\'/', '/(\S)\'([^\'\s])/', '/(\s|\A)"(?!\s)/', '/"(\s|\S|\Z)/', '/\'([\s.]|\Z)/', '/(\d+)x(\d+)/');
-    $dynamic_replacements = array('’$1','$1‘', '$1″', '$1′', '$1’$2', '$1“$2', '”$1', '’$1', '$1×$2'); 
+    $dynamic_replacements = array('’$1','$1‘', '$1″', '$1′', '$1’$2', '$1“$2', '”$1', '’$1', '$1×$2');
 
     for ( $i = 0; $i < $stop; $i++ ) {

trunk/wp-includes/general-template.php

@@ -352 +352 @@
          $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts WHERE post_type ='post' AND post_status = 'publish' GROUP BY YEAR(post_date) ORDER BY post_date DESC" . $limit);
         if ($arcresults) {
-            $afterafter = $after;
-            foreach ($arcresults as $arcresult) {
-                $url = get_year_link($arcresult->year);
-                $text = sprintf('%d', $arcresult->year);
+            $afterafter = $after;
+            foreach ($arcresults as $arcresult) {
+                $url = get_year_link($arcresult->year);
+                $text = sprintf('%d', $arcresult->year);
                 if ($show_post_count)
-                    $after = ' ('.$arcresult->posts.')' . $afterafter;
-                echo get_archives_link($url, $text, $format, $before, $after);
-            }
-        }           
+                    $after = ' ('.$arcresult->posts.')' . $afterafter;
+                echo get_archives_link($url, $text, $format, $before, $after);
+            }
+        }
     } elseif ( 'daily' == $type ) {
         $arcresults = $wpdb->get_results("SELECT DISTINCT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date DESC" . $limit);

trunk/wp-includes/gettext.php

@@ -309 +309 @@
     # results in parse error in eval
     $string .= ';';
-    
+
     $total = 0;
     $plural = 0;

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

@@ -29 +29 @@
     ((now.getSeconds() < 10) ? ":0" : ":") + now.getSeconds();
 }
-    
+
 function autosave_update_nonce() {
     var response = nonceAjax.response;
@@ -39 +39 @@
     var res = parseInt(response);
     var message;
-    
+
     if(isNaN(res)) {
         message = "<?php echo js_escape(__('Error: ')); ?>" + response;
@@ -71 +71 @@
     var res = parseInt(response);
     var message;
-    
+
     if(isNaN(res)) {
         message = "<?php echo js_escape(__('Error: ')); ?>" + response;
@@ -128 +128 @@
     }
     catslist = goodcats.join(",");
-    
+
     autosaveAjax.setVar("action", "autosave");
     autosaveAjax.setVar("cookie", document.cookie);
@@ -140 +140 @@
         autosaveAjax.setVar("ping_status", 'open');
     if(form.excerpt)
-        autosaveAjax.setVar("excerpt", form.excerpt.value);     
-        
+        autosaveAjax.setVar("excerpt", form.excerpt.value);
+
     if ( typeof tinyMCE == "undefined" || tinyMCE.configs.length < 1 || rich == false ) {
         autosaveAjax.setVar("content", form.content.value);
@@ -148 +148 @@
         autosaveAjax.setVar("content", form.content.value);
     }
-        
+
     autosaveAjax.requestFile = "<?php echo get_option('siteurl'); ?>/wp-admin/admin-ajax.php";
     autosaveAjax.method = "POST";

trunk/wp-includes/js/tinymce/tiny_mce_config.php

@@ -41 +41 @@
     $mce_browsers = apply_filters('mce_browsers', array('msie', 'gecko', 'opera', 'safari'));
     $mce_browsers = implode($mce_browsers, ',');
-    
+
     $mce_popups_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/popups.css';
     $mce_css = get_option('siteurl') . '/wp-includes/js/tinymce/plugins/wordpress/wordpress.css';

trunk/wp-includes/link-template.php

@@ -263 +263 @@
     }
 
-    return apply_filters('post_comments_feed_link', $url);  
+    return apply_filters('post_comments_feed_link', $url);
 }
 

trunk/wp-includes/pluggable.php

@@ -164 +164 @@
         $phpmailer = new PHPMailer();
     }
-        
+
     $mail = compact('to', 'subject', 'message', 'headers');
     $mail = apply_filters('wp_mail', $mail);

trunk/wp-includes/post-template.php

@@ -102 +102 @@
                 $output .= ' <a href="'. get_permalink() . "#more-$id\" class=\"more-link\">$more_link_text</a>";
         }
-            
+
     }
     if ( $preview ) // preview fix for javascript bug with foreign languages

trunk/wp-includes/post.php

@@ -81 +81 @@
         $extended = '';
     }
-    
+
     // Strip leading and trailing whitespace
     $main = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $main);
@@ -556 +556 @@
             $post_date_gmt = get_gmt_from_date($post_date);
     }
-        
+
     if ( 'publish' == $post_status ) {
         $now = gmdate('Y-m-d H:i:59');
@@ -705 +705 @@
     if ( 'future' == $post_status )
         wp_schedule_single_event(strtotime($post_date_gmt. ' GMT'), 'publish_future_post', array($post_ID));
-        
+
     do_action('save_post', $post_ID);
     do_action('wp_insert_post', $post_ID);
@@ -1108 +1108 @@
     if (!empty($authors)) {
         $post_authors = preg_split('/[\s,]+/',$authors);
-        
+
         if ( count($post_authors) ) {
             foreach ( $post_authors as $post_author ) {

trunk/wp-includes/query.php

@@ -201 +201 @@
     global $wp_query;
 
-    return $wp_query->is_singular;  
+    return $wp_query->is_singular;
 }
 
@@ -286 +286 @@
     var $in_the_loop = false;
     var $post;
-    
+
     var $comments;
     var $comment_count = 0;
@@ -361 +361 @@
         $this->parse_query('');
     }
-    
+
     function fill_query_vars($array) {
         $keys = array(
@@ -396 +396 @@
                 $array[$key] = '';
         }
-        
+
         return $array;
     }
@@ -411 +411 @@
             $this->query_vars = $qv;
         }
-        
+
         $qv = $this->fill_query_vars($qv);
-        
+
         if ( ! empty($qv['robots']) ) {
             $this->is_robots = true;
@@ -610 +610 @@
         // Shorthand.
         $q = &$this->query_vars;
-        
+
         $q = $this->fill_query_vars($q);
 
@@ -1002 +1002 @@
             }
         }
-        
+
         // Comments feeds
         if ( $this->is_comment_feed && ( $this->is_archive || $this->is_search || !$this->is_singular ) ) {
@@ -1014 +1014 @@
                 $cgroupby = '';
             }
-            
+
             $cjoin = apply_filters('comment_feed_join', $cjoin);
             $cwhere = apply_filters('comment_feed_where', $cwhere);
             $cgroupby = apply_filters('comment_feed_groupby', $cgroupby);
-            
+
             $this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby ORDER BY comment_date_gmt DESC LIMIT " . get_settings('posts_per_rss'));
             $this->comment_count = count($this->comments);
 
             $post_ids = array();
-            
+
             foreach ($this->comments as $comment)
                 $post_ids[] = (int) $comment->comment_post_ID;
-            
+
             $post_ids = join(',', $post_ids);
             $join = '';
@@ -1062 +1062 @@
             $this->comment_count = count($this->comments);
         }
-        
+
         if ( !empty($limits) ) {
             $found_posts_query = apply_filters( 'found_posts_query', 'SELECT FOUND_ROWS()' );
@@ -1069 +1069 @@
             $this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
         }
-        
+
         // Check post status to determine if post should be displayed.
         if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
@@ -1149 +1149 @@
         }
     }
-    
+
     function next_comment() {
         $this->current_comment++;
-        
+
         $this->comment = $this->comments[$this->current_comment];
         return $this->comment;
     }
-    
+
     function the_comment() {
         global $comment;
-        
+
         $comment = $this->next_comment();
-        
+
         if ($this->current_comment == 0) {
             do_action('comment_loop_start');
         }
     }
-    
+
     function have_comments() {
         if ($this->current_comment + 1 < $this->comment_count) {
@@ -1173 +1173 @@
             $this->rewind_comments();
         }
-        
+
         return false;
     }
-    
+
     function rewind_comments() {
         $this->current_comment = -1;

trunk/wp-includes/theme.php

@@ -187 +187 @@
             $parent_dir = dirname(dirname($theme_file));
             if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) {
-                $template = "$parent_dir/$template";    
+                $template = "$parent_dir/$template"; 
             } else {
                 $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.'));
@@ -485 +485 @@
 
 function header_textcolor() {
-    echo get_header_textcolor();    
+    echo get_header_textcolor();
 }
 
@@ -493 +493 @@
 
 function header_image() {
-    echo get_header_image();    
+    echo get_header_image();
 }
 

trunk/wp-includes/wp-db.php

@@ -49 +49 @@
         return $this->__construct($dbuser, $dbpassword, $dbname, $dbhost);
     }
-    
+
     function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
         register_shutdown_function(array(&$this, "__destruct"));
@@ -80 +80 @@
 
     function __destruct() {
-        return true;        
+        return true;    
     }
 
@@ -182 +182 @@
         $this->result = @mysql_query($query, $this->dbh);
         ++$this->num_queries;
-    
+
         if (SAVEQUERIES)
             $this->queries[] = array( $query, $this->timer_stop() );
@@ -256 +256 @@
         if ( $query )
             $this->query($query);
-        
+    
         if ( !isset($this->last_result[$y]) )
             return null;

trunk/wp-login.php

@@ -97 +97 @@
 
         do_action('lostpassword_post');
-        
+
         if ( empty( $errors ) ) {
             $user_data = get_userdatabylogin(trim($_POST['user_login']));
@@ -329 +329 @@
         }
     }
-    
+
     if ( $_POST && empty( $user_login ) )
         $errors['user_login'] = __('<strong>ERROR</strong>: The username field is empty.');

trunk/xmlrpc.php

@@ -505 +505 @@
             $category["description"] = "";
         }
-        
+    
         $new_category = array(
             "cat_name"              => $category["name"],