Changeset 8600

Timestamp:

08/09/2008 05:36:14 AM (18 years ago)

Author:

ryan

Message:

Trailing whitespace cleanup

Location:

trunk

Files:

• wp-admin/admin-ajax.php (modified) (2 diffs)
• wp-admin/admin-header.php (modified) (3 diffs)
• wp-admin/async-upload.php (modified) (1 diff)
• wp-admin/css/colors-classic.css (modified) (9 diffs)
• wp-admin/css/colors-fresh.css (modified) (10 diffs)
• wp-admin/css/dashboard-rtl.css (modified) (1 diff)
• wp-admin/css/dashboard.css (modified) (2 diffs)
• wp-admin/css/global-rtl.css (modified) (1 diff)
• wp-admin/css/ie-rtl.css (modified) (5 diffs)
• wp-admin/css/login.css (modified) (1 diff)
• wp-admin/css/media-rtl.css (modified) (1 diff)
• wp-admin/css/press-this-rtl.css (modified) (2 diffs)
• wp-admin/css/press-this.css (modified) (3 diffs)
• wp-admin/css/widgets.css (modified) (1 diff)
• wp-admin/custom-header.php (modified) (1 diff)
• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-admin/edit-link-categories.php (modified) (1 diff)
• wp-admin/edit-link-form.php (modified) (1 diff)
• wp-admin/edit-page-form.php (modified) (4 diffs)
• wp-admin/gears-manifest.php (modified) (1 diff)
• wp-admin/import/mt.php (modified) (1 diff)
• wp-admin/import/wordpress.php (modified) (1 diff)
• wp-admin/import/wp-cat2tag.php (modified) (4 diffs)
• wp-admin/includes/bookmark.php (modified) (1 diff)
• wp-admin/includes/class-wp-filesystem-base.php (modified) (7 diffs)
• wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (1 diff)
• wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (2 diffs)
• wp-admin/includes/dashboard.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (2 diffs)
• wp-admin/includes/image.php (modified) (4 diffs)
• wp-admin/includes/media.php (modified) (1 diff)
• wp-admin/includes/misc.php (modified) (1 diff)
• wp-admin/includes/plugin-install.php (modified) (19 diffs)
• wp-admin/includes/plugin.php (modified) (6 diffs)
• wp-admin/includes/post.php (modified) (4 diffs)
• wp-admin/includes/schema.php (modified) (2 diffs)
• wp-admin/includes/template.php (modified) (13 diffs)
• wp-admin/includes/update-core.php (modified) (1 diff)
• wp-admin/includes/update.php (modified) (6 diffs)
• wp-admin/includes/upgrade.php (modified) (2 diffs)
• wp-admin/includes/widgets.php (modified) (1 diff)
• wp-admin/js/common.js (modified) (1 diff)
• wp-admin/js/editor.js (modified) (2 diffs)
• wp-admin/js/media-upload.js (modified) (2 diffs)
• wp-admin/js/revisions-js.php (modified) (1 diff)
• wp-admin/js/word-count.js (modified) (2 diffs)
• wp-admin/js/wp-gears.js (modified) (1 diff)
• wp-admin/plugins.php (modified) (8 diffs)
• wp-admin/post.php (modified) (1 diff)
• wp-admin/press-this.php (modified) (15 diffs)
• wp-admin/revision.php (modified) (2 diffs)
• wp-admin/rtl.css (modified) (5 diffs)
• wp-admin/update.php (modified) (3 diffs)
• wp-admin/upload.php (modified) (1 diff)
• wp-admin/user-edit.php (modified) (2 diffs)
• wp-admin/widgets.php (modified) (1 diff)
• wp-admin/wp-admin.css (modified) (3 diffs)
• wp-app.php (modified) (1 diff)
• wp-includes/cache.php (modified) (1 diff)
• wp-includes/class-phpass.php (modified) (1 diff)
• wp-includes/class.wp-dependencies.php (modified) (1 diff)
• wp-includes/classes.php (modified) (5 diffs)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/feed.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (5 diffs)
• wp-includes/functions.php (modified) (6 diffs)
• wp-includes/general-template.php (modified) (2 diffs)
• wp-includes/http.php (modified) (7 diffs)
• wp-includes/js/autosave.js (modified) (5 diffs)
• wp-includes/js/tinymce/tiny_mce_config.php (modified) (12 diffs)
• wp-includes/js/tinymce/wp-mce-help.php (modified) (2 diffs)
• wp-includes/l10n.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (3 diffs)
• wp-includes/media.php (modified) (5 diffs)
• wp-includes/pluggable.php (modified) (5 diffs)
• wp-includes/post-template.php (modified) (2 diffs)
• wp-includes/post.php (modified) (5 diffs)
• wp-includes/query.php (modified) (2 diffs)
• wp-includes/rewrite.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (3 diffs)
• wp-includes/shortcodes.php (modified) (3 diffs)
• wp-includes/taxonomy.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)
• wp-includes/user.php (modified) (2 diffs)
• wp-includes/widgets.php (modified) (4 diffs)
• wp-includes/wp-db.php (modified) (2 diffs)
• wp-login.php (modified) (2 diffs)
• wp-settings.php (modified) (1 diff)
• xmlrpc.php (modified) (4 diffs)

trunk/wp-admin/admin-ajax.php

@@ -14 +14 @@
         $s = $_GET['q']; // is this slashed already?
 
-        if ( strstr( $s, ',' ) ) { 
-                $s = explode( ',', $s ); 
-                $s = $s[count( $s ) - 1]; 
+        if ( strstr( $s, ',' ) ) {
+                $s = explode( ',', $s );
+                $s = $s[count( $s ) - 1];
         }
         $s = trim( $s );
@@ -279 +279 @@
                 $x->send();
         }
-        
+
         $cat = wp_insert_category( $_POST, true );
 

trunk/wp-admin/admin-header.php

@@ -75 +75 @@
 
 <?php
-if ( ! $is_opera ) { 
+if ( ! $is_opera ) {
 ?>
         <div id="gears-info-box" class="info-box" style="display:none;">
@@ -90 +90 @@
         <div id="gears-msg2" style="display:none;">
         <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
-        <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p> 
-        <p><?php 
-        
+        <p><?php _e('Gears is installed on this computer but is not enabled for use with WordPress.'); ?></p>
+        <p><?php
+
         if ( $is_safari )
                 _e('To enable it, make sure this web site is not on the denied list in Gears Settings under the Safari menu, then click the button below.');
         else
-                _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.'); 
-        
+                _e('To enable it, make sure this web site is not on the denied list in Gears Settings under your browser Tools menu, then click the button below.');
+
         ?></p>
         <p><strong><?php _e('However if this is a public or shared computer, Gears should not be enabled.'); ?></strong></p>
@@ -107 +107 @@
         <h3 class="info-box-title"><?php _e('Gears Status'); ?></h3>
         <p><?php
-        
+
         if ( $is_safari )
                 _e('Gears is installed and enabled on this computer. You can disable it from the Safari menu.');
         else
-                _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.'); 
-        
+                _e('Gears is installed and enabled on this computer. You can disable it from your browser Tools menu.');
+
         ?></p>
         <p><?php _e('If there are any errors, try disabling Gears, then reload the page and enable it again.'); ?></p>

trunk/wp-admin/async-upload.php

@@ -23 +23 @@
         wp_die(__('You do not have permission to upload files.'));
 
-// just fetch the detail form for that attachment       
+// just fetch the detail form for that attachment
 if ( ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
         echo get_media_item($id);

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

@@ -555 +555 @@
 /* TinyMCE */
 .wp_themeSkin *,
-.wp_themeSkin a:hover, 
-.wp_themeSkin a:link, 
-.wp_themeSkin a:visited, 
+.wp_themeSkin a:hover,
+.wp_themeSkin a:link,
+.wp_themeSkin a:visited,
 .wp_themeSkin a:active {
          color: #000;
@@ -578 +578 @@
 
 /* Button */
-.wp_themeSkin .mceButton { 
+.wp_themeSkin .mceButton {
         background-color: #e9e8e8;
         border-color: #83B4D5;
@@ -584 +584 @@
 
 .wp_themeSkin a.mceButtonEnabled:hover,
-.wp_themeSkin a.mceButtonActive, 
+.wp_themeSkin a.mceButtonActive,
 .wp_themeSkin a.mceButtonSelected {
         background-color: #d6d8da;
@@ -601 +601 @@
 }
 
-.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
+.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
 .wp_themeSkin .mceListBoxHover .mceOpen,
 .wp_themeSkin .mceListBoxSelected .mceOpen,
@@ -609 +609 @@
 }
 
-.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
+.wp_themeSkin table.mceListBoxEnabled:hover .mceText,
 .wp_themeSkin .mceListBoxHover .mceText {
         border-color: #7789ba !important;
@@ -615 +615 @@
 
 .wp_themeSkin select.mceListBox {
-        border-color: #b3c7e1; 
+        border-color: #b3c7e1;
         background-color: #fff;
 }
 
 /* SplitButton */
-.wp_themeSkin .mceSplitButton a.mceAction, 
+.wp_themeSkin .mceSplitButton a.mceAction,
 .wp_themeSkin .mceSplitButton a.mceOpen {
         background-color: #e9e8e8;
@@ -632 +632 @@
         background-color: #d6d8da;
         border-color: #7789ba !important;
-} 
+}
 
 .wp_themeSkin .mceSplitButtonActive {
@@ -671 +671 @@
 
 .wp_themeSkin .mceMenu .mceText {
-        color: #000; 
+        color: #000;
 }
 
@@ -682 +682 @@
 }
 .wp_themeSkin .mceMenuItemTitle a {
-        background-color: #ccc; 
+        background-color: #ccc;
         border-bottom-color: #aaa;
 }

trunk/wp-admin/css/colors-fresh.css

@@ -38 +38 @@
 #user_info a:hover, li.widget-list-control-item h4.widget-title a:hover, .submit a, #dashmenu a:hover, #footer a, #upload-menu li a.upload-tab-link, li.widget-list-control-item h4.widget-title a,
 #dragHelper li.widget-list-control-item h4.widget-title a,
-#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover, 
+#draghelper li.widget-list-control-item h4.widget-title a:visited, .login #backtoblog a:hover,
 #plugin-information .action-button a, #plugin-information .action-button a:hover, #plugin-information .action-button a:visited {
         color: #fff;
@@ -527 +527 @@
 /* TinyMCE */
 .wp_themeSkin *,
-.wp_themeSkin a:hover, 
-.wp_themeSkin a:link, 
-.wp_themeSkin a:visited, 
+.wp_themeSkin a:hover,
+.wp_themeSkin a:link,
+.wp_themeSkin a:visited,
 .wp_themeSkin a:active {
          color: #000;
@@ -550 +550 @@
 
 /* Button */
-.wp_themeSkin .mceButton { 
+.wp_themeSkin .mceButton {
         background-color: #e9e8e8;
         border-color: #abc0fb;
@@ -556 +556 @@
 
 .wp_themeSkin a.mceButtonEnabled:hover,
-.wp_themeSkin a.mceButtonActive, 
+.wp_themeSkin a.mceButtonActive,
 .wp_themeSkin a.mceButtonSelected {
         background-color: #d6d8da;
@@ -573 +573 @@
 }
 
-.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen, 
+.wp_themeSkin table.mceListBoxEnabled:hover .mceOpen,
 .wp_themeSkin .mceListBoxHover .mceOpen,
 .wp_themeSkin .mceListBoxSelected .mceOpen,
@@ -581 +581 @@
 }
 
-.wp_themeSkin table.mceListBoxEnabled:hover .mceText, 
+.wp_themeSkin table.mceListBoxEnabled:hover .mceText,
 .wp_themeSkin .mceListBoxHover .mceText {
         border-color: #7789ba !important;
@@ -587 +587 @@
 
 .wp_themeSkin select.mceListBox {
-        border-color: #b3c7e1; 
+        border-color: #b3c7e1;
         background-color: #fff;
 }
 
 /* SplitButton */
-.wp_themeSkin .mceSplitButton a.mceAction, 
+.wp_themeSkin .mceSplitButton a.mceAction,
 .wp_themeSkin .mceSplitButton a.mceOpen {
         background-color: #e9e8e8;
@@ -604 +604 @@
         background-color: #d6d8da;
         border-color: #7789ba !important;
-} 
+}
 
 .wp_themeSkin .mceSplitButtonActive {
@@ -643 +643 @@
 
 .wp_themeSkin .mceMenu .mceText {
-        color: #000; 
+        color: #000;
 }
 
@@ -654 +654 @@
 }
 .wp_themeSkin .mceMenuItemTitle a {
-        background-color: #ccc; 
+        background-color: #ccc;
         border-bottom-color: #aaa;
 }

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

@@ -26 +26 @@
         font-family: sans-serif !important;
 }
-        
+
 #dashboard-widgets .widget_rss ul li a {
         float:right;

trunk/wp-admin/css/dashboard.css

@@ -67 +67 @@
 }
 
-div.dashboard-widget-holder {   
+div.dashboard-widget-holder {
         margin-top: 20px;
         width: 50%;
@@ -158 +158 @@
         border-radius: 3px;
         cursor: pointer;
-        text-decoration: none;  
+        text-decoration: none;
 }
 

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

@@ -9 +9 @@
 .textleft { text-align: right; }
 .textright { text-align: left; }
-        
+
 .wrap h2 { font-family: sans-serif; }
 

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

@@ -4 +4 @@
 }
 
-#wpcontent #sidemenu li a { 
-        float: left; 
+#wpcontent #sidemenu li a {
+        float: left;
 }
 
@@ -60 +60 @@
 
 /* Search box gets stuck to the right, hidden outside view */
-* html #post-search, * html #widget-search { 
+* html #post-search, * html #widget-search {
         height: 1% !important;
         right: 600px !important;
@@ -76 +76 @@
 
 /* Bad floating in the sub-sub-sub menu makes links un-clickable */
-* html .subsubsub li { 
+* html .subsubsub li {
         display: block; float: right; margin: 0 2px;
 }
@@ -86 +86 @@
 
 /* Theme selector on theme edit page gets stuck to the left, hidden outside view */
-* html #themeselector { 
+* html #themeselector {
         position: static;
 }
@@ -92 +92 @@
 /* Template edit area floats beneath template list, gets RTLed */
 * html #template {
-        float: right; 
+        float: right;
         overflow: hidden;
-        width: 755px !important; 
+        width: 755px !important;
 }
 * html #template #newcontent {

trunk/wp-admin/css/login.css

@@ -31 +31 @@
         border-radius: 3px;
         cursor: default;
-        text-decoration: none;  
+        text-decoration: none;
         margin-top: -6px;
 }

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

@@ -7 +7 @@
         float: right;
         padding: 0 25px 0 0;
-        margin: 5px 3px 5px 5px; 
+        margin: 5px 3px 5px 5px;
 }
 .align .field input {

trunk/wp-admin/css/press-this-rtl.css

@@ -3 +3 @@
 }
 
-#viewsite { 
-        right:auto; left: 8px; 
+#viewsite {
+        right:auto; left: 8px;
 }
 
-ul#menu { 
-        padding-right: 8px; 
+ul#menu {
+        padding-right: 8px;
 }
 
-.ui-tabs-nav li { 
-        float: right; 
+.ui-tabs-nav li {
+        float: right;
 }
 
-div#posting { 
-        padding-right:16px; padding-left: 0; 
+div#posting {
+        padding-right:16px; padding-left: 0;
 }
 
-div#categories { 
-        right: auto; left: 16px; 
+div#categories {
+        right: auto; left: 16px;
 }
 
-div#categories h2 { 
-        margin:0.5em 1em 0.5em 0; 
+div#categories h2 {
+        margin:0.5em 1em 0.5em 0;
 }
 
-#jaxtag { 
-        padding-right :1em; padding-left: 0; 
+#jaxtag {
+        padding-right :1em; padding-left: 0;
 }
 
-input#newtag { 
-        margin-left: 4px; width: 100px; 
+input#newtag {
+        margin-left: 4px; width: 100px;
 }
 
-#photo_directions span { 
-        right: auto; left: 3px 
+#photo_directions span {
+        right: auto; left: 3px
 }
 
-#TB_ajaxContent #options { 
-        right: auto; left: 25px; 
+#TB_ajaxContent #options {
+        right: auto; left: 25px;
 }
 
@@ -51 +51 @@
 }
 
-.video_split #extra_fields { 
-        float: right; 
+.video_split #extra_fields {
+        float: right;
 }
 
-.video_split .editor_area { 
-        float: left; 
+.video_split .editor_area {
+        float: left;
 }

trunk/wp-admin/css/press-this.css

@@ -87 +87 @@
 
 .ui-tabs-nav a:hover,.ui-tabs-nav a:focus,.ui-tabs-nav a:active,
-.ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited { 
+.ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited {
         cursor: pointer;
 }
@@ -262 +262 @@
         border: 2px solid #ccc;
         margin: 0 4px 4px 0;
-} 
+}
 #img_container a:hover, #img_container a:active {
         border: 2px solid #000;
@@ -300 +300 @@
         padding: 3px;
         margin-right: 5px;
-        width: 16em;    
+        width: 16em;
 }
 

trunk/wp-admin/css/widgets.css

@@ -113 +113 @@
 }
 
-li.widget-list-control-item h4, 
-#dragHelper li.widget-list-control-item h4, 
+li.widget-list-control-item h4,
+#dragHelper li.widget-list-control-item h4,
 li.widget-sortable h4 {
         margin: 0;

trunk/wp-admin/custom-header.php

@@ -28 +28 @@
                 if ( 1 == $step )
                         wp_enqueue_script('colorpicker');
-                elseif ( 2 == $step )   
+                elseif ( 2 == $step )
                         wp_enqueue_script('cropper');
         }

trunk/wp-admin/edit-form-advanced.php

@@ -106 +106 @@
 <p>
 <select name='post_status' id='post_status' tabindex='4'>
-<?php 
-// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability) 
+<?php
+// only show the publish menu item if they are allowed to publish posts or they are allowed to edit this post (accounts for 'edit_published_posts' capability)
 if ( current_user_can('publish_posts') OR ( $post->post_status == 'publish' AND current_user_can('edit_post', $post->ID) ) ) :
 ?>

trunk/wp-admin/edit-link-categories.php

@@ -12 +12 @@
                 $cat_name = get_term_field('name', $cat_ID, 'link_category');
                 $default_cat_id = get_option('default_link_category');
-                
+
                 // Don't delete the default cats.
                 if ( $cat_ID == $default_cat_id )

trunk/wp-admin/edit-link-form.php

@@ -117 +117 @@
 <div id="categories-all" class="ui-tabs-panel">
         <ul id="categorychecklist" class="list:category categorychecklist form-no-clear">
-                <?php 
+                <?php
                 if ( isset($link->link_id) )
                         wp_link_category_checklist($link->link_id);

trunk/wp-admin/edit-page-form.php

@@ -91 +91 @@
 <?php // Show publish in dropdown if user can publish or if they can re-publish this page ('edit_published_pages')
 // 'publish' option will be selected for published AND private posts (checkbox overrides dropdown)
-if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) : 
+if ( current_user_can('publish_pages') OR ( $post->post_status == 'publish' AND current_user_can('edit_page', $post->ID) ) ) :
 ?>
 <option<?php selected( $post->post_status, 'publish' ); selected( $post->post_status, 'private' );?> value='publish'><?php _e('Published') ?></option>
@@ -102 +102 @@
 </select>
 </p>
-<?php if ( current_user_can( 'publish_posts' ) ) : ?> 
+<?php if ( current_user_can( 'publish_posts' ) ) : ?>
 <p><label for="post_status_private" class="selectit"><input id="post_status_private" name="post_status" type="checkbox" value="private" <?php checked($post->post_status, 'private'); ?> tabindex='4' /> <?php _e('Keep this page private') ?></label></p>
 <?php endif; ?>
@@ -210 +210 @@
 
 
-<?php 
+<?php
 function page_custom_meta_box($post){
 ?>
@@ -239 +239 @@
 <p><label for="ping_status" class="selectit"><input name="ping_status" type="checkbox" id="ping_status" value="open" <?php checked($post->ping_status, 'open'); ?> /> <?php _e('Allow Pings') ?></label></p>
 <p><?php _e('These settings apply to this page only. &#8220;Pings&#8221; are <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">trackbacks and pingbacks</a>.'); ?></p>
-<?php 
+<?php
 }
 add_meta_box('pagecommentstatusdiv', __('Comments &amp; Pings'), 'page_comments_status_meta_box', 'page', 'advanced', 'core');

trunk/wp-admin/gears-manifest.php

@@ -47 +47 @@
                 if ( is_bool( $style->extra['rtl'] ) )
                         $rtl_href = str_replace( '.css', '-rtl.css', $src );
-                else 
+                else
                         $rtl_href = str_replace( array( '/wp-admin/', '/wp-includes/' ), array( '', '../wp-includes/' ), $style->extra['rtl'] );
 

trunk/wp-admin/import/mt.php

@@ -225 +225 @@
                                 wp_create_categories($post->categories, $post_id);
                         }
-                        
+
                          // Add tags or keywords
                         if ( 1 < strlen($post->post_keywords) ) {
-                                // Keywords exist. 
+                                // Keywords exist.
                                 printf(__('<br />Adding tags <i>%s</i>...'), stripslashes($post->post_keywords));
                                 wp_add_post_tags($post_id, $post->post_keywords);

trunk/wp-admin/import/wordpress.php

@@ -340 +340 @@
                 if ( $post_ID && !empty($this->post_ids_processed[$post_ID]) ) // Processed already
                         return 0;
-                
+
                 set_time_limit( 60 );
 

trunk/wp-admin/import/wp-cat2tag.php

@@ -104 +104 @@
                                  if ( in_array( intval($category->term_id),  $this->hybrids_ids ) )
                                         echo ' <a href="#note"> * </a>';
-                                
+
                                 if ( isset($hier[$category->term_id]) )
                                         $this->_category_children($category, $hier); ?></li>
@@ -244 +244 @@
                                         if ( ! ($id = is_term( $category->slug, 'post_tag' ) ) )
                                                 $id = wp_insert_term($category->name, 'post_tag', array('slug' => $category->slug));
-                                        
+
                                         $id = $id['term_taxonomy_id'];
                                         $posts = get_objects_in_term($category->term_id, 'category');
@@ -253 +253 @@
                                                 clean_post_cache($post);
                                         }
-                                        
+
                                         if ( $values ) {
                                                 $wpdb->query("INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join(',', $values) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)");
@@ -263 +263 @@
                                         continue;
                                 }
-                                
+
                                 // if tag already exists, add it to all posts in the category
                                 if ( $tag_ttid = $wpdb->get_var( $wpdb->prepare("SELECT term_taxonomy_id FROM $wpdb->term_taxonomy WHERE term_id = %d AND taxonomy = 'post_tag'", $category->term_id) ) ) {

trunk/wp-admin/includes/bookmark.php

@@ -121 +121 @@
         if ( $update ) {
                 $wpdb->query( $wpdb->prepare("UPDATE $wpdb->links SET link_url = %s,
-                        link_name = %s, link_image = %s, link_target = %s, 
-                        link_visible = %s, link_description = %s, link_rating = %s, 
+                        link_name = %s, link_image = %s, link_target = %s,
+                        link_visible = %s, link_description = %s, link_rating = %s,
                         link_rel = %s, link_notes = %s, link_rss = %s
                         WHERE link_id = %s", $link_url, $link_name, $link_image, $link_target, $link_visible, $link_description, $link_rating, $link_rel, $link_notes, $link_rss, $link_id) );
         } else {
-                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)", 
+                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->links (link_url, link_name, link_image, link_target, link_description, link_visible, link_owner, link_rating, link_rel, link_notes, link_rss) VALUES(%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)",
                 $link_url,$link_name, $link_image, $link_target, $link_description, $link_visible, $link_owner, $link_rating, $link_rel, $link_notes, $link_rss) );
                 $link_id = (int) $wpdb->insert_id;

trunk/wp-admin/includes/class-wp-filesystem-base.php

@@ -3 +3 @@
         var $verbose = false;
         var $cache = array();
-        
+
         var $method = '';
-        
+
         function abspath() {
-                if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false ) 
+                if ( defined('FTP_BASE') && strpos($this->method, 'ftp') !== false )
                         return FTP_BASE;
                 return $this->find_folder(ABSPATH);
         }
         function wp_content_dir() {
-                if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false ) 
+                if ( defined('FTP_CONTENT_DIR') && strpos($this->method, 'ftp') !== false )
                         return FTP_CONTENT_DIR;
                 return $this->find_folder(WP_CONTENT_DIR);
         }
         function wp_plugins_dir() {
-                if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false ) 
+                if ( defined('FTP_PLUGIN_DIR') && strpos($this->method, 'ftp') !== false )
                         return FTP_PLUGIN_DIR;
                 return $this->find_folder(WP_PLUGIN_DIR);
@@ -34 +34 @@
                 return $this->abspath();
         }
-        
+
         function find_folder($folder) {
                 $folder = str_replace('\\', '/', $folder); //Windows Sanitiation
@@ -48 +48 @@
                 return $return;
         }
-        
+
         // Assumes $folder is windows sanitized;
         // Assumes that the drive letter is safe to be stripped off, Should not be a problem for windows servers.
@@ -54 +54 @@
                 if ( empty( $base ) || '.' == $base )
                         $base = trailingslashit($this->cwd());
-                
+
                 $folder = preg_replace('|^([a-z]{1}):|i', '', $folder); //Strip out windows driveletter if its there.
-                
+
                 $folder_parts = explode('/', $folder);
                 $last_path = $folder_parts[ count($folder_parts) - 1 ];
-                
+
                 $files = $this->dirlist( $base );
-                
+
                 foreach ( $folder_parts as $key ) {
                         if ( $key == $last_path )
                                 continue; //We want this to be caught by the next code block.
 
-                        //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder, 
-                        // If its found, change into it and follow through looking for it. 
+                        //Working from /home/ to /user/ to /wordpress/ see if that file exists within the current folder,
+                        // If its found, change into it and follow through looking for it.
                         // If it cant find WordPress down that route, it'll continue onto the next folder level, and see if that matches, and so on.
                         // If it reaches the end, and still cant find it, it'll return false for the entire function.
@@ -79 +79 @@
                         }
                 }
-                
+
                 //Only check this as a last resort, to prevent locating the incorrect install. All above proceeedures will fail quickly if this is the right branch to take.
                 if(isset( $files[ $last_path ] ) ) {
@@ -89 +89 @@
                         return false;//Prevent tihs function looping again.
                 //As an extra last resort, Change back to / if the folder wasnt found. This comes into effect when the CWD is /home/user/ but WP is at /var/www/.... mainly dedicated setups.
-                return $this->search_for_folder($folder, '/', true); 
-                
+                return $this->search_for_folder($folder, '/', true);
+
         }
-        
+
         //Common Helper functions.
         function gethchmod($file){
@@ -144 +144 @@
                    if($key = array_search($attarray[$i], $legal))
                            $realmode .= $legal[$key];
-                           
+
                 $mode = str_pad($realmode, 9, '-');
                 $trans = array('-'=>'0', 'r'=>'4', 'w'=>'2', 'x'=>'1');
                 $mode = strtr($mode,$trans);
-                
+
                 $newmode = '';
                 $newmode .= $mode[0] + $mode[1] + $mode[2];

trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -83 +83 @@
                 $this->permission = $perm;
         }
-        
+
         function get_contents($file, $type = '', $resumepos = 0 ){
                 if( empty($type) ){

trunk/wp-admin/includes/class-wp-filesystem-ftpsockets.php

@@ -126 +126 @@
                 $temp = wp_tempnam( $file );
                 if ( ! $temphandle = fopen($temp, 'w+') ){
-                        unlink($temp);          
+                        unlink($temp);
                         return false;
                 }
@@ -147 +147 @@
                 return $this->ftp->chdir($file);
         }
-        
+
         function chgrp($file, $group, $recursive = false ) {
                 return false;

trunk/wp-admin/includes/dashboard.php

@@ -436 +436 @@
                 if( preg_match('|/([^/]+?)/?$|', $link, $matches) )
                         $slug = $matches[1];
-                else 
+                else
                         $slug = '';
 

trunk/wp-admin/includes/file.php

@@ -286 +286 @@
 
         $filename = wp_unique_filename( $uploads['path'], $file['name'], $unique_filename_callback );
-        
+
         // Strip the query strings.
         $filename = str_replace('?','-', $filename);
         $filename = str_replace('&','-', $filename);
-        
+
         // Move the file to the uploads dir
         $new_file = $uploads['path'] . "/$filename";
@@ -472 +472 @@
         if ( 'direct' == $type )
                 return true;
-                
+
         if( ! $credentials = get_option('ftp_credentials') )
                 $credentials = array();

trunk/wp-admin/includes/image.php

@@ -18 +18 @@
  */
 function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
-        
+
         $thumbpath = image_resize( $file, $max_side, $max_side );
         return apply_filters( 'wp_create_thumbnail', $thumbpath );
@@ -99 +99 @@
                 $sizes = array('thumbnail', 'medium');
                 $sizes = apply_filters('intermediate_image_sizes', $sizes);
-                
+
                 foreach ($sizes as $size) {
                         $resized = image_make_intermediate_size( $file, get_option("{$size}_size_w"), get_option("{$size}_size_h"), get_option("{$size}_crop") );
@@ -105 +105 @@
                                 $metadata['sizes'][$size] = $resized;
                 }
-                        
+
                 // fetch additional metadata from exif/iptc
                 $image_meta = wp_read_image_metadata( $file );
@@ -276 +276 @@
         else
                 $result = true;
-                
+
         return apply_filters('file_is_displayable_image', $result, $path);
 }

trunk/wp-admin/includes/media.php

@@ -1289 +1289 @@
                 $alt_help = __('Also used as alternate text for the image');
         }
-        
+
         return '
         <table class="describe"><tbody>

trunk/wp-admin/includes/misc.php

@@ -165 +165 @@
                 if( $message->get_error_data() )
                         $message = $message->get_error_message() . ': ' . $message->get_error_data();
-                else 
+                else
                         $message = $message->get_error_message();
         }

trunk/wp-admin/includes/plugin-install.php

@@ -9 +9 @@
         $args = apply_filters('plugins_api_args', $args, $action); //NOTE: Ensure that an object is returned via this filter.
         $res = apply_filters('plugins_api', false, $action, $args); //NOTE: Allows a plugin to completely override the builtin WordPress.org API.
-        
+
         if ( ! $res ) {
                 $request = wp_remote_post('http://api.wordpress.org/plugins/info/1.0/', array(), array(), array('action' => $action, 'request' => serialize($args)) );
@@ -68 +68 @@
         }
         ?>
-        
+
         <p><?php _e('Plugins extend and expand the functionality of WordPress. You may automatically install plugins from the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> via this page.') ?></p>
-        
+
         <h4><?php _e('Search') ?></h4>
         <?php install_search_form() ?>
@@ -77 +77 @@
                 <?php _e('<strong>Tag:</strong> Searches for plugins tagged as such') ?><br />
                 <?php _e('<strong>Author:</strong> Searches for plugins created by the Author, or which the Author contributed to.') ?></p>
-        
+
         <h4><?php _e('Popular tags') ?></h4>
         <p><?php _e('You may also search based on these popular tags, These are tags which are most popular on WordPress.org') ?></p>
@@ -143 +143 @@
 function display_plugins_table($plugins, $page = 1, $totalpages = 1){
         global $tab;
-        
+
         $type = isset($_REQUEST['type']) ? $_REQUEST['type'] : '';
         $term = isset($_REQUEST['s']) ? $_REQUEST['s'] : '';
@@ -167 +167 @@
                                 'current' => $page
                         ));
-                        
+
                         if ( $page_links )
-                                echo "\t\t<div class='tablenav-pages'>$page_links</div>";       
+                                echo "\t\t<div class='tablenav-pages'>$page_links</div>";
 ?>
         </div>
@@ -187 +187 @@
                         if( empty($plugins) )
                                 echo '<tr><td colspan="5">', __('No plugins match your request.'), '</td></tr>';
-                        
+
                         foreach( (array) $plugins as $plugin ){
                                 if ( is_object($plugin) )
@@ -195 +195 @@
                                 $description = wp_kses($plugin['description'], $plugins_allowedtags);
                                 $version = wp_kses($plugin['version'], $plugins_allowedtags);
-                                
+
                                 $name = strip_tags($title . ' ' . $version);
-                                
+
                                 $author = $plugin['author'];
                                 if( ! empty($plugin['author']) )
@@ -203 +203 @@
 
                                 $author = wp_kses($author, $plugins_allowedtags);
-                                
+
                                 if( isset($plugin['homepage']) )
                                         $title = '<a target="_blank" href="' . $plugin['homepage'] . '">' . $title . '</a>';
-                                
+
                                 $action_links = array();
                                 $action_links[] = '<a href="' . admin_url('plugin-install.php?tab=plugin-information&plugin=' . $plugin['slug'] .
                                                                         '&TB_iframe=true&width=600&height=800') . '" class="thickbox onclick" title="' .
                                                                         attribute_escape($name) . '">' . __('Install') . '</a>';
-                                
+
                                 $action_links = apply_filters('plugin_install_action_links', $action_links, $plugin);
                         ?>
@@ -279 +279 @@
 function install_plugin_information() {
         global $tab;
-        
+
         $api = plugins_api('plugin_information', array('slug' => $_REQUEST['plugin']));
 
@@ -285 +285 @@
         if( empty($section) || ! isset($api->sections[ $section ]) )
                 $section = array_shift( $section_titles = array_keys((array)$api->sections) );
-        
+
         install_iframe_header();
         echo "<div id='$tab-header'>\n";
         echo "<ul id='sidemenu'>\n";
         foreach ( (array)$api->sections as $section_name => $content ) {
-        
+
                 $title = $section_name;
                 $title[0] = strtoupper($title[0]); //Capitalize first character.
@@ -303 +303 @@
         echo "</ul>\n";
         echo "</div>\n";
-        
+
         ?>
         <div class="alignright fyi">
@@ -350 +350 @@
                         <li><strong><?php _e('Author:') ?></strong> <?php echo links_add_target($api->author, '_blank') ?></li>
 <?php endif; if ( ! empty($api->last_updated) ) : ?>
-                        <li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php 
+                        <li><strong><?php _e('Last Updated:') ?></strong> <span title="<?php echo $api->last_updated ?>"><?php
                                                         printf( __('%s ago'), human_time_diff(strtotime($api->last_updated)) ) ?></span></li>
 <?php endif; if ( ! empty($api->requires) ) : ?>
@@ -381 +381 @@
                         $title[0] = strtoupper($title[0]);
                         $title = str_replace('_', ' ', $title);
-                        
+
                         $content = links_add_base_url($content, 'http://wordpress.org/extend/plugins/' . $api->slug . '/');
                         $content = links_add_target($content, '_blank');
-                        
+
                         $san_title = attribute_escape(sanitize_title_with_dashes($title));
-                        
+
                         $display = ( $section_name == $section ) ? 'block' : 'none';
-                        
+
                         echo "\t<div id='section-{$san_title}' style='display: {$display};'>\n";
                         echo "\t\t<h2 class='long-header'>$title</h2>";
@@ -407 +407 @@
 
         install_iframe_header();
-        
+
         $api = plugins_api('plugin_information', array('slug' => $plugin, 'fields' => array('sections' => false) ) ); //Save on a bit of bandwidth.
-        
+
         echo '<div class="wrap">';
         echo '<h2>', sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ), '</h2>';
@@ -420 +420 @@
 function do_plugin_install($download_url = '', $plugin_information = NULL) {
         global $wp_filesystem;
-        
+
         if ( empty($download_url) ) {
                 show_message( __('No plugin Specified') );
                 return;
         }
-        
+
         $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin'] : '';
-        
+
         $url = 'plugin-install.php?tab=install';
         $url = add_query_arg(array('plugin' => $plugin, 'plugin_name' => $_REQUEST['plugin_name'], 'download_url' => $_REQUEST['download_url']), $url);
@@ -447 +447 @@
 
         $result = wp_install_plugin( $download_url, 'show_message' );
-        
+
         if ( is_wp_error($result) ) {
                 show_message($result);
@@ -490 +490 @@
         if( empty($content_dir) )
                 return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-        
+
         $plugins_dir = trailingslashit( $plugins_dir );
         $content_dir = trailingslashit( $content_dir );
@@ -513 +513 @@
         // Unzip package to working directory
         $result = unzip_file($download_file, $working_dir);
-        
+
         // Once extracted, delete the package
         unlink($download_file);
-        
+
         if ( is_wp_error($result) ) {
                 $wp_filesystem->delete($working_dir, true);
                 return $result;
         }
-        
+
         //Get a list of the directories in the working directory before we delete it, We need to know the new folder for the plugin
         $filelist = array_keys( $wp_filesystem->dirlist($working_dir) );
-        
+
         if( $wp_filesystem->exists( $plugins_dir . $filelist[0] ) ) {
                 $wp_filesystem->delete($working_dir, true);
                 return new WP_Error('install_folder_exists', __('Folder allready exists.'), $filelist[0] );
         }
-        
+
         apply_filters('install_feedback', __('Installing the plugin'));
         // Copy new version of plugin into place.
@@ -543 +543 @@
         // Remove working directory
         $wp_filesystem->delete($working_dir, true);
-        
+
         if( empty($filelist) )
                 return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-        
+
         $folder = $filelist[0];
         $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash

trunk/wp-admin/includes/plugin.php

@@ -91 +91 @@
 
         return array(
-                                'Name' => $name, 'PluginURI' => $uri, 'Description' => $description, 
-                                'Author' => $author_name, 'AuthorURI' => $author_uri, 'Version' => $version, 
+                                'Name' => $name, 'PluginURI' => $uri, 'Description' => $description,
+                                'Author' => $author_name, 'AuthorURI' => $author_uri, 'Version' => $version,
                                 'TextDomain' => $text_domain, 'DomainPath' => $domain_path
                                 );
@@ -98 +98 @@
 
 function get_plugins($plugin_folder = '') {
-        
+
         if ( ! $cache_plugins = wp_cache_get('plugins', 'plugins') )
                 $cache_plugins = array();
-        
+
         if ( isset($cache_plugins[ $plugin_folder ]) )
                 return $cache_plugins[ $plugin_folder ];
-        
+
         $wp_plugins = array ();
         $plugin_root = WP_PLUGIN_DIR;
@@ -152 +152 @@
         uasort( $wp_plugins, create_function( '$a, $b', 'return strnatcasecmp( $a["Name"], $b["Name"] );' ));
 
-        $cache_plugins[ $plugin_folder ] = $wp_plugins; 
-        wp_cache_set('plugins', $cache_plugins, 'plugins'); 
+        $cache_plugins[ $plugin_folder ] = $wp_plugins;
+        wp_cache_set('plugins', $cache_plugins, 'plugins');
 
         return $wp_plugins;
@@ -280 +280 @@
         if ( empty($plugins_dir) )
                 return new WP_Error('fs_no_plugins_dir', __('Unable to locate WordPress Plugin directory.'));
-        
+
         $plugins_dir = trailingslashit( $plugins_dir );
 
@@ -296 +296 @@
                 else
                         $deleted = $wp_filesystem->delete($plugins_dir . $plugin_file);
-        
+
                 if ( ! $deleted )
                         $errors[] = $plugin_file;
         }
-        
+
         if( ! empty($errors) )
                 return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s'), implode(', ', $errors)) );
-        
+
         return true;
 }
@@ -318 +318 @@
 
         //Invalid is any plugin that is deactivated due to error.
-        $invalid = array(); 
+        $invalid = array();
 
         // If a plugin file does not exist, remove it from the list of active

trunk/wp-admin/includes/post.php

@@ -60 +60 @@
         $previous_status = get_post_field('post_status',  $_POST['ID']);
 
-        // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. 
+        // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
         // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
         if ( 'page' == $_POST['post_type'] ) {
@@ -357 +357 @@
                 wp_cache_delete($post_ID, 'post_meta');
 
-                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta 
+                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->postmeta
                         (post_id,meta_key,meta_value ) VALUES (%s, %s, %s)",
                         $post_ID, $metakey, $metavalue) );
@@ -421 +421 @@
         $meta_value = maybe_serialize( stripslashes( $meta_value ));
         $meta_id = (int) $meta_id;
-        
+
         $data  = compact( 'meta_key', 'meta_value' );
         $where = compact( 'meta_id' );
@@ -586 +586 @@
                 $post->post_status = 'publish';
                 $post->post_date = date('Y-m-d H:i:s');
-                $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID); 
+                $post->post_name = sanitize_title($post->post_name? $post->post_name : $post->post_title, $post->ID);
         }
 

trunk/wp-admin/includes/schema.php

@@ -155 +155 @@
 function populate_options() {
         global $wpdb, $wp_db_version;
-        
+
         $guessurl = wp_guess_url();
-        
+
         do_action('populate_options');
-        
+
         add_option('siteurl', $guessurl);
         add_option('blogname', __('My Blog'));
@@ -258 +258 @@
         add_option('enable_app', 0);
         add_option('enable_xmlrpc', 0);
-        
+
         // Delete unused options
         $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog', '_wpnonce', '_wp_http_referer', 'Update', 'action', 'rich_editing', 'autosave_interval', 'deactivated_plugins');

trunk/wp-admin/includes/template.php

@@ -58 +58 @@
                         echo "\t" . _cat_row( $category, $level );
 
-                unset($categories[$i]); // Prune the working set                
+                unset($categories[$i]); // Prune the working set
                 $count++;
 
@@ -192 +192 @@
 
         $args = array();
-        
+
         if ( is_array( $selected_cats ) )
                 $args['selected_cats'] = $selected_cats;
@@ -548 +548 @@
         }
 
-        /* 
+        /*
          * arrange pages into two parts: top level pages and children_pages
-         * children_pages is two dimensional array, eg. 
-         * children_pages[10][] contains all sub-pages whose parent is 10. 
+         * children_pages is two dimensional array, eg.
+         * children_pages[10][] contains all sub-pages whose parent is 10.
          * It only takes O(N) to arrange this and it takes O(1) for subsequent lookup operations
          * If searching, ignore hierarchy and treat everything as top level
          */
         if ( empty($_GET['s']) )  {
-                
+
                 $top_level_pages = array();
                 $children_pages  = array();
-                
+
                 foreach ( $pages as $page ) {
-                        
+
                         // catch and repair bad pages
                         if ( $page->post_parent == $page->ID ) {
@@ -568 +568 @@
                                 clean_page_cache( $page->ID );
                         }
-        
+
                         if ( 0 == $page->post_parent )
                                 $top_level_pages[] = $page;
@@ -581 +581 @@
         $start = ($pagenum - 1) * $per_page;
         $end = $start + $per_page;
-        
+
         foreach ( $pages as $page ) {
                 if ( $count >= $end )
@@ -594 +594 @@
                         _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
         }
-        
+
         // if it is the last pagenum and there are orphaned pages, display them with paging as well
         if ( isset($children_pages) && $count < $end ){
@@ -614 +614 @@
  */
 function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page ) {
-        
+
         if ( ! isset( $children_pages[$parent] ) )
-                return; 
-                
+                return;
+
         $start = ($pagenum - 1) * $per_page;
         $end = $start + $per_page;
-        
+
         foreach ( $children_pages[$parent] as $page ) {
-                
+
                 if ( $count >= $end )
                         break;
-                        
+
                 // If the page starts in a subtree, print the parents.
                 if ( $count == $start && $page->post_parent > 0 ) {
@@ -646 +646 @@
                 if ( $count >= $start )
                         echo "\t" . display_page_row( $page, $level );
-                        
+
                 $count++;
 
                 _page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page );
         }
-        
+
         unset( $children_pages[$parent] ); //required in order to keep track of orphans
 }
@@ -659 +659 @@
 
         $current_user = wp_get_current_user();
-        
+
         if ( !( is_object( $user_object) && is_a( $user_object, 'WP_User' ) ) )
                 $user_object = new WP_User( (int) $user_object );
@@ -748 +748 @@
 
                 $post_link .= get_the_title($comment->comment_post_ID) . '</a>';
-                        
+
                 $edit_link_start = "<a class='row-title' href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' title='" . __('Edit comment') . "'>";
                 $edit_link_end = '</a>';
@@ -755 +755 @@
                 $edit_link_start = $edit_link_end ='';
         }
-        
+
         $author_url = get_comment_author_url();
         if ( 'http://' == $author_url )
@@ -789 +789 @@
     <?php endif; ?>
     <a href="edit-comments.php?s=<?php comment_author_IP() ?>&amp;mode=detail"><?php comment_author_IP() ?></a>
-        <?php endif; //current_user_can?>    
+        <?php endif; //current_user_can?>
     </p>
         <?php if ( 'detail' == $mode ) comment_text(); ?>
@@ -1172 +1172 @@
         global $wp_meta_boxes;
 
-        
+
         if  ( !isset($wp_meta_boxes) )
                 $wp_meta_boxes = array();

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

@@ -128 +128 @@
                 return new WP_Error('insane_distro', __('The update could not be unpacked') );
         }
-        
+
         apply_filters('update_feedback', __('Installing the latest version'));
 

trunk/wp-admin/includes/update.php

@@ -75 +75 @@
         else
                 printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%1$s">View version %3$s Details</a> or <a href="%4$s">upgrade automatically</a>.'), $plugin_data['Name'], $details_url, $r->new_version, wp_nonce_url('update.php?action=upgrade-plugin&amp;plugin=' . $file, 'upgrade-plugin_' . $file) );
-        
+
         echo '</td></tr>';
 }
@@ -110 +110 @@
         if( empty($content_dir) )
                 return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-        
+
         $plugins_dir = trailingslashit( $plugins_dir );
         $content_dir = trailingslashit( $content_dir );
@@ -137 +137 @@
         // Unzip package to working directory
         $result = unzip_file($download_file, $working_dir);
-        
+
         // Once extracted, delete the package
         unlink($download_file);
-        
+
         if ( is_wp_error($result) ) {
                 $wp_filesystem->delete($working_dir, true);
@@ -155 +155 @@
         apply_filters('update_feedback', __('Removing the old version of the plugin'));
         $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
-        
+
         // If plugin is in its own directory, recursively delete the directory.
         if ( strpos($plugin, '/') && $this_plugin_dir != $plugins_dir ) //base check on if plugin includes directory seperator AND that its not the root plugin folder
@@ -183 +183 @@
         // Force refresh of plugin update information
         delete_option('update_plugins');
-        
+
         if( empty($filelist) )
                 return false; //We couldnt find any files in the working dir, therefor no plugin installed? Failsafe backup.
-        
+
         $folder = $filelist[0];
         $plugin = get_plugins('/' . $folder); //Ensure to pass with leading slash
@@ -224 +224 @@
         if( empty($content_dir) )
                 return new WP_Error('fs_no_content_dir', __('Unable to locate WordPress Content directory (wp-content).'));
-        
+
         $wp_dir = trailingslashit( $wp_dir );
         $content_dir = trailingslashit( $content_dir );

trunk/wp-admin/includes/upgrade.php

@@ -572 +572 @@
                 }
 
-                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES 
+                $wpdb->query( $wpdb->prepare("INSERT INTO $wpdb->terms (term_id, name, slug, term_group) VALUES
                 (%d, %s, %s, %d)", $term_id, $name, $slug, $term_group) );
 
@@ -733 +733 @@
                 populate_roles_250();
         }
-        
+
 }
 

trunk/wp-admin/includes/widgets.php

@@ -85 +85 @@
                                         'key' => array_search( $widget['id'], $sidebars_widgets[$sidebar] ),
                                 ) ) );
-                                
+
                                 $widget_control_template = '<textarea rows="1" cols="1">' . htmlspecialchars( $widget_control_template ) . '</textarea>';
                         }

trunk/wp-admin/js/common.js

@@ -20 +20 @@
                 this.each(function() {
                         var el = JQ(this), txt;
-                        
+
                         if ( txt = el.attr('title') ) el.attr('tip', txt).removeAttr('title');
                         else return;

trunk/wp-admin/js/editor.js

@@ -16 +16 @@
 
         document.getElementById(el).style.color = '#fff';
-        if ( tinyMCE.activeEditor.isHidden() ) 
+        if ( tinyMCE.activeEditor.isHidden() )
             content = document.getElementById(el).value;
         else
@@ -170 +170 @@
         // pee = pee.replace(new RegExp('^((?: )*)\\s', 'mg'), '$1 ');
 
-        // Fix the pre|script tags         
+        // Fix the pre|script tags
         pee = pee.replace(/<(pre|script)[^>]*>[\s\S]+?<\/\1>/g, function(a) {
                         a = a.replace(/<br ?\/?>[\r\n]*/g, '\n');

trunk/wp-admin/js/media-upload.js

@@ -8 +8 @@
                 if ( h.indexOf('[caption') != -1 )
                         h = ed.plugins.wpeditimage._do_shcode(h);
-                
+
                 ed.execCommand('mceInsertContent', false, h);
         } else
@@ -41 +41 @@
                 });
         };
-        
+
         jQuery('a.thickbox').click(function(){
                 if ( typeof tinyMCE != 'undefined' &&  tinyMCE.activeEditor ) {

trunk/wp-admin/js/revisions-js.php

@@ -9 +9 @@
                 'qwertyuiop[]\\asdfghjkl;\'zxcvbnm,./QWERTYUIOP{}|ASDFGHJKL:"ZXCVBNM<>?-='
         );
-}       
+}
 
 $j = clean_url( site_url( '/wp-includes/js/jquery/jquery.js' ) );

trunk/wp-admin/js/word-count.js

@@ -9 +9 @@
                         t.block = 0;
                         t.wc(co.val());
-                        co.keyup( function(e) { 
+                        co.keyup( function(e) {
                                 if ( e.keyCode == last ) return true;
                                 if ( 13 == e.keyCode || 8 == last || 46 == last ) t.wc(co.val());
@@ -34 +34 @@
                         }, 1 );
                 }
-        } 
+        }
 }(jQuery));
 

trunk/wp-admin/js/wp-gears.js

@@ -5 +5 @@
                 if ( 'undefined' == typeof google || ! google.gears ) return;
 
-                if ( 'undefined' == typeof localServer ) 
+                if ( 'undefined' == typeof localServer )
                         localServer = google.gears.factory.create("beta.localserver");
 

trunk/wp-admin/plugins.php

@@ -75 +75 @@
                         if( ! current_user_can('delete_plugins') )
                                 wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
-                        
+
                         check_admin_referer('bulk-manage-plugins');
-                        
+
                         $plugins = $_REQUEST['checked']; //$_POST = from the plugin form; $_GET = from the FTP details screen.
                         include(ABSPATH . 'wp-admin/update.php');
@@ -83 +83 @@
                         $title = __('Delete Plugin');
                         $parent_file = 'plugins.php';
-                        
+
                         if( ! isset($_REQUEST['verify-delete']) ) {
                                 wp_enqueue_script('jquery');
@@ -89 +89 @@
                                 ?>
                         <div class="wrap">
-                                <h2><?php _e('Delete Plugin(s)'); ?></h2>               
+                                <h2><?php _e('Delete Plugin(s)'); ?></h2>
                                 <?php
                                         $files_to_delete = $plugin_info = array();
@@ -112 +112 @@
                                 <p>
                                         <ul>
-                                                <?php 
+                                                <?php
                                                 foreach( $plugin_info as $plugin )
                                                         echo '<li>', sprintf(__('%s by %s'), $plugin['Name'], $plugin['Author']), '</li>';
@@ -141 +141 @@
                                         ?>
                                         </ul>
-                                </div>                          
+                                </div>
                         </div>
                                 <?php
@@ -232 +232 @@
         if ( !empty($plugin_data['PluginURI']) && !empty($plugin_data['Name']) )
                 $plugin_data['Title'] = '<a href="' . $plugin_data['PluginURI'] . '" title="'.__( 'Visit plugin homepage' ).'">' . $plugin_data['Name'] . '</a>';
-        
+
         if ( ! empty($plugin_data['AuthorURI']) )
                 $plugin_data['Author'] = '<a href="' . $plugin_data['AuthorURI'] . '" title="'.__( 'Visit author homepage' ).'">' . $plugin_data['Author'] . '</a>';
-        
+
         $plugin_data['Description'] = wptexturize( $plugin_data['Description'] );
 
@@ -299 +299 @@
                 <td class='vers'>{$plugin_data['Version']}</td>
                 <td class='desc'><p>{$plugin_data['Description']}</p></td>
-                <td class='togl action-links'>";  
+                <td class='togl action-links'>";
                 if ( !empty($action_links) )
                         echo implode(' | ', $action_links);
-                echo '</td> 
+                echo '</td>
         </tr>';
                 do_action( 'after_plugin_row', $plugin_file, $plugin_data, $context );
@@ -309 +309 @@
         </tbody>
 </table>
-<?php 
+<?php
 } //End print_plugins_table()
 ?>

trunk/wp-admin/post.php

@@ -43 +43 @@
                         $location = get_permalink( $post_ID );
                 elseif ( false !== strpos($location, 'edit.php') )
-                        $location = add_query_arg('posted', $post_ID, $location);               
+                        $location = add_query_arg('posted', $post_ID, $location);
                 elseif ( false !== strpos($location, 'wp-admin') )
                         $location = "post-new.php?posted=$post_ID";

trunk/wp-admin/press-this.php

@@ -35 +35 @@
 
                         foreach( (array) $_REQUEST['photo_src'] as $key => $image) {
-                                
+
                                 // see if files exist in content - we don't want to upload non-used selected files.
                                 if( strpos($_REQUEST['content'], $image) !== false ) {
                                         $upload = media_sideload_image($image, $post_ID, $_REQUEST['photo_description'][$key]);
-                                         
+
                                         // Replace the POSTED content <img> with correct uploaded ones.
                                         // escape quote for matching
@@ -50 +50 @@
 
                 case "video":
-                        if($_REQUEST['embed_code']) 
+                        if($_REQUEST['embed_code'])
                                 $content .= $_REQUEST['embed_code']."\n\n";
                         $content .= $_REQUEST['content'];
@@ -74 +74 @@
 
 // For submitted posts.
-if ( 'post' == $_REQUEST['action'] ) { 
+if ( 'post' == $_REQUEST['action'] ) {
         check_admin_referer('press-this'); $post_ID = press_it(); ?>
         <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -139 +139 @@
 
         <p id="options"><a href="#" class="select button"><?php _e('Insert Image'); ?></a> <a href="#" class="cancel button"><?php _e('Cancel'); ?></a></p>
-<?php die; 
+<?php die;
 }
 
@@ -164 +164 @@
 
         <p id="options"><a href="#" class="select"><?php _e('Insert Image'); ?></a> | <a href="#" class="cancel"><?php _e('Cancel'); ?></a></p>
-<?php die; 
+<?php die;
 }
 
@@ -177 +177 @@
 if($_REQUEST['ajax'] == 'photo_images') {
         function get_images_from_uri($uri) {
-                if( preg_match('/\.(jpg|jpe|jpeg|png|gif)/', $uri) && !strpos($uri,'blogger.com') ) 
+                if( preg_match('/\.(jpg|jpe|jpeg|png|gif)/', $uri) && !strpos($uri,'blogger.com') )
                         return "'".$uri."'";
 
@@ -187 +187 @@
                 $pattern = '/<img ([^>]*)src=(\"|\')([^<>]+?\.(png|jpeg|jpg|jpe|gif))[^<>\'\"]*(\2)([^>\/]*)\/*>/is';
                 preg_match_all($pattern, $content, $matches);
-                
+
                 if ( empty($matches[1]) ) return '';
 
@@ -199 +199 @@
                                 else
                                         $src = 'http://'.str_replace('//','/', $host['host'].'/'.dirname($host['path']).'/'.$src);
-                        
+
                         $sources[] = clean_url($src);
                 }
                 return "'" . implode("','", $sources) . "'";
-        } 
+        }
 
         $url = urldecode($url);
         $url = str_replace(' ', '%20', $url);
-        echo 'new Array('.get_images_from_uri($url).')'; 
+        echo 'new Array('.get_images_from_uri($url).')';
 die;
 }
@@ -227 +227 @@
 
         for (i = 0; i < my_src.length; i++) {
-                img = new Image(); 
-                img.src = my_src[i]; 
-                img_attr = 'id="img' + i + '"'; 
+                img = new Image();
+                img.src = my_src[i];
+                img_attr = 'id="img' + i + '"';
                 skip = false;
                 if (img.width && img.height) {
-                        if (img.width * img.height < 2500) 
+                        if (img.width * img.height < 2500)
                                 skip = true;
                         aspect = img.width / img.height;
@@ -304 +304 @@
 ?>
         <script type="text/javascript">
-        <?php if ( user_can_richedit() ) { 
+        <?php if ( user_can_richedit() ) {
                 $language = ( '' == get_locale() ) ? 'en' : strtolower( substr(get_locale(), 0, 2) );
                 // Add TinyMCE languages
@@ -360 +360 @@
         });
         jQuery('#newtag').blur(function() {
-                if ( this.value == '' ) 
+                if ( this.value == '' )
                         jQuery(this).val( postL10n.addTag ).addClass( 'form-input-tip' );
         });
@@ -412 +412 @@
                                 jQuery('body').addClass('video_split');
                                 jQuery('#extra_fields').load('<?php echo clean_url($_SERVER['PHP_SELF']); ?>', { ajax: 'video', s: '<?php echo attribute_escape($selection); ?>'}, function() {
-                                        <?php 
+                                        <?php
                                         $content = '';
                                         if ( preg_match("/youtube\.com\/watch/i", $url) ) {
@@ -461 +461 @@
 
         jQuery(document).ready(function() {
-        jQuery('#menu li').click(function (){ 
+        jQuery('#menu li').click(function (){
                         tab_name = this.id.split('_');
                         tab_name = tab_name[0];
@@ -519 +519 @@
                                         </ul>
                                 </div>
-                                
+
                                 <h2><?php _e('Tags') ?></h2>
                                 <p id="jaxtag"><label class="hidden" for="newtag"><?php _e('Tags'); ?></label><input type="text" name="tags_input" class="tags-input" id="tags-input" size="40" tabindex="3" value="<?php echo get_tags_to_edit( $post->ID ); ?>" /></p>
@@ -525 +525 @@
                         </div>
 
-                        <p class="submit">         
+                        <p class="submit">
                                 <input type="submit" name="draft" value="<?php _e('Save') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>
                                 <input type="submit" name="publish" value="<?php _e('Publish') ?>" onclick="document.getElementById('photo_saving').style.display = '';"/>

trunk/wp-admin/revision.php

@@ -85 +85 @@
         )
                 break;
-        
+
         $post_title = '<a href="' . get_edit_post_link() . '">' . get_the_title() . '</a>';
         $h2 = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
@@ -155 +155 @@
 <?php endif;
 
-// use get_post_to_edit filters? 
+// use get_post_to_edit filters?
 $identical = true;
 foreach ( _wp_post_revision_fields() as $field => $field_title ) :

trunk/wp-admin/rtl.css

@@ -14 +14 @@
 
 #update-nag {
-        clear: both; 
-        margin-bottom: 1em; 
+        clear: both;
+        margin-bottom: 1em;
 }
 
 /* Clears update nag, so it doesn't hide the submenu */
-#update-nag { 
-        clear: both; 
-        margin-bottom: 1em; 
+#update-nag {
+        clear: both;
+        margin-bottom: 1em;
 }
 
@@ -131 +131 @@
 }
 
-.tablenav .delete 
+.tablenav .delete
 {
         margin-left: 40px;
@@ -338 +338 @@
 /* WPH - TinyMCE */
 
-#media-items th.label { 
-        width: 120px; 
-}
-#media-items th.label .alignleft { 
-        width: 100px; 
-}
-
-#media-items th.label .alignright { 
-        width: 16px; 
-        height: 16px; 
-} 
+#media-items th.label {
+        width: 120px;
+}
+#media-items th.label .alignleft {
+        width: 100px;
+}
+
+#media-items th.label .alignright {
+        width: 16px;
+        height: 16px;
+}
 
 /* LTRs some url- and code-only form fields */
-input#href, input#src, input#class_name { 
-        direction: ltr; 
-        text-align: left; 
-}
-
-#sidemenu a { 
-        float: right; 
+input#href, input#src, input#class_name {
+        direction: ltr;
+        text-align: left;
+}
+
+#sidemenu a {
+        float: right;
 }
 
@@ -376 +376 @@
 
 #gallery-form table.widefat th {
-        float: left; 
+        float: left;
         width: 74%;
         text-align: center;
@@ -399 +399 @@
 }
 
-#library-form { 
-        float: right; 
+#library-form {
+        float: right;
 }
 

trunk/wp-admin/update.php

@@ -36 +36 @@
         } else {
                 //Result is the new plugin file relative to WP_PLUGIN_DIR
-                show_message( __('Plugin upgraded successfully') );     
+                show_message( __('Plugin upgraded successfully') );
                 if( $result && $was_activated ){
                         show_message(__('Attempting reactivation of the plugin'));
@@ -107 +107 @@
                         show_message( __('Installation Failed') );
         } else {
-                show_message( __('WordPress upgraded successfully') );  
+                show_message( __('WordPress upgraded successfully') );
         }
         echo '</div>';
@@ -125 +125 @@
                 check_admin_referer('activate-plugin_' . $plugin);
                 if( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
-                        wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); 
+                        wp_redirect( 'update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
                         activate_plugin($plugin);
-                        wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] ); 
+                        wp_redirect( 'update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce'] );
                         die();
                 }

trunk/wp-admin/upload.php

@@ -210 +210 @@
 
 <?php
- 
+
 if ( 1 == count($posts) && is_singular() ) :
-        
+
         $comments = $wpdb->get_results( $wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved != 'spam' ORDER BY comment_date", $id) );
         if ( $comments ) :

trunk/wp-admin/user-edit.php

@@ -42 +42 @@
 
         }
-        
+
         function update_nickname ( ) {
-                
+
                 var nickname = jQuery('#nickname').val();
                 var display_nickname = jQuery('#display_nickname').val();
-                
+
                 if ( nickname == '' ) {
                         jQuery('#display_nickname').remove();
                 }
                 jQuery('#display_nickname').val(nickname).html(nickname);
-                
-        }
-
-        jQuery(function($) { 
-                $('#pass1').keyup( check_pass_strength ) 
+
+        }
+
+        jQuery(function($) {
+                $('#pass1').keyup( check_pass_strength )
                 $('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
         } );
-        
+
         jQuery(document).ready( function() {
                 jQuery('#pass1,#pass2').attr('autocomplete','off');
@@ -191 +191 @@
         </tr>
         </table>
-        
+
         <label for="admin_color_<?php echo $color; ?>"><?php echo $color_info->name ?></label>
 </div>

trunk/wp-admin/widgets.php

@@ -133 +133 @@
                 <br />
                 <form action="<?php echo clean_url( remove_query_arg( $query_args ) ); ?>" method="post">
-                
+
                         <ul class="widget-control-list">
                                 <li class="widget-list-control-item">

trunk/wp-admin/wp-admin.css

@@ -226 +226 @@
         border-radius: 3px;
         cursor: pointer;
-        text-decoration: none;  
+        text-decoration: none;
 }
 
@@ -913 +913 @@
 }
 
-#profile-page .form-table input[type=text] { 
+#profile-page .form-table input[type=text] {
         width: 300px;
 }
@@ -1517 +1517 @@
 #poststuff h3, #poststuff .closed h3 {
         cursor: pointer;
-} 
+}
 
 .hide-if-no-js {

trunk/wp-app.php

@@ -176 +176 @@
                         $path = $_SERVER['ORIG_PATH_INFO'];
                 else
-                        $path = $_SERVER['PATH_INFO']; 
+                        $path = $_SERVER['PATH_INFO'];
 
                 $method = $_SERVER['REQUEST_METHOD'];

trunk/wp-includes/cache.php

@@ -252 +252 @@
          * by default.
          *
-         * On success the group and the id will be added to the 
+         * On success the group and the id will be added to the
          * $non_existant_objects property in the class.
          *

trunk/wp-includes/class-phpass.php

@@ -51 +51 @@
 
                 $this->random_state = microtime() . (function_exists('getmypid') ? getmypid() : '') . uniqid(rand(), TRUE);
-        
+
         }
 

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

@@ -80 +80 @@
                                 else
                                         continue; // We're at the top level.  Move on to the next one.
-                        }                                       
+                        }
 
                         $this->to_do[$handle] = true;

trunk/wp-includes/classes.php

@@ -430 +430 @@
                 call_user_func_array(array(&$this, 'start_el'), $cb_args);
 
-                $id = $element->$id_field; 
-                
+                $id = $element->$id_field;
+
                 // descend only the depth is right and there are chilrens for this element
-                if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) { 
+                if ( ($max_depth == 0 || $max_depth > $depth+1 ) && isset( $children_elements[$id]) ) {
 
                         foreach( $children_elements[ $id ] as $child ){
-                                
+
                                 if ( !isset($newlevel) ) {
                                         $newlevel = true;
@@ -445 +445 @@
                                 $this->display_element( $child, $children_elements, $max_depth, $depth + 1, $args, $output );
                         }
-                        unset( $children_elements[ $id ] ); 
+                        unset( $children_elements[ $id ] );
                 }
 
@@ -491 +491 @@
                  * need to display in hierarchical order
                  * seperate elements into two buckets: top level and children elements
-                 * children_elements is two dimensional array, eg. 
-                 * children_elements[10][] contains all sub-elements whose parent is 10. 
+                 * children_elements is two dimensional array, eg.
+                 * children_elements[10][] contains all sub-elements whose parent is 10.
                  */
                 $top_level_elements = array();
@@ -510 +510 @@
 
                         $root = $elements[0];
-                        
+
                         $top_level_elements = array();
                         $children_elements  = array();
@@ -534 +534 @@
                                         $this->display_element( $op, $empty_array, 1, 0, $args, $output );
                  }
-                 
+
                  return $output;
         }

trunk/wp-includes/comment-template.php

@@ -666 +666 @@
 
         define('COMMENTS_TEMPLATE', true);
-                
+
         $include = apply_filters('comments_template', STYLESHEETPATH . $file );
         if ( file_exists( $include ) )

trunk/wp-includes/feed.php

@@ -307 +307 @@
  * @subpackage Feed
  * @since 2.1.0
- * @uses apply_filters() 
+ * @uses apply_filters()
  *
  * @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'.

trunk/wp-includes/formatting.php

@@ -845 +845 @@
         if ( '' == $text ) {
                 $text = get_the_content('');
-                
-                $text = strip_shortcodes( $text ); 
-                
+
+                $text = strip_shortcodes( $text );
+
                 $text = apply_filters('the_content', $text);
                 $text = str_replace(']]>', ']]>', $text);
@@ -1437 +1437 @@
 function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
         $attrs = implode('|', (array)$attrs);
-        return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", 
+        return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i",
                         create_function('$m', 'return _links_add_base($m, "' . $base . '");'),
                         $content);
@@ -1456 +1456 @@
 function _links_add_base($m, $base) {
         //1 = attribute name  2 = quotation mark  3 = URL
-        return $m[1] . '=' . $m[2] . 
+        return $m[1] . '=' . $m[2] .
                 (strpos($m[3], 'http://') === false ?
                         path_join($base, $m[3]) :
@@ -1466 +1466 @@
  * Adds a Target attribute to all links in passed content.
  *
- * This function by default only applies to <a> tags, 
+ * This function by default only applies to <a> tags,
  * however this can be modified by the 3rd param.
  * NOTE: Any current target attributed will be striped and replaced.
@@ -1480 +1480 @@
 function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
         $tags = implode('|', (array)$tags);
-        return preg_replace_callback("!<($tags)(.+?)>!i", 
+        return preg_replace_callback("!<($tags)(.+?)>!i",
                         create_function('$m', 'return _links_add_target($m, "' . $target . '");'),
                         $content);

trunk/wp-includes/functions.php

@@ -1475 +1475 @@
         if ( $echo )
                 echo $nonce_field;
-        
+
         if ( $referer )
                 wp_referer_field( $echo, 'previous' );
-        
+
         return $nonce_field;
 }
@@ -1600 +1600 @@
         if ( empty($upload_path) )
                 $dir = WP_CONTENT_DIR . '/uploads';
-        else 
+        else
                 $dir = $upload_path;
 
         // $dir is absolute, $path is (maybe) relative to ABSPATH
         $dir = path_join( ABSPATH, $dir );
-        
+
         if ( !$url = get_option( 'upload_url_path' ) ) {
                 if ( empty($upload_path) or ( $upload_path == $dir ) )
@@ -1618 +1618 @@
         }
 
-        $bdir = $dir; 
+        $bdir = $dir;
         $burl = $url;
 
@@ -1639 +1639 @@
                 return array( 'error' => $message );
         }
-        
+
         $uploads = array( 'path' => $dir, 'url' => $url, 'subdir' => $subdir, 'basedir' => $bdir, 'baseurl' => $burl, 'error' => false );
 
@@ -1886 +1886 @@
                 $trans['activate']['plugin']   = array( __( 'Your attempt to activate this plugin: "%s" has failed.' ), 'use_id' );
                 $trans['deactivate']['plugin'] = array( __( 'Your attempt to deactivate this plugin: "%s" has failed.' ), 'use_id' );
-                $trans['upgrade']['plugin']    = array( __( 'Your attempt to upgrade this plugin: "%s" has failed.' ), 'use_id' );            
+                $trans['upgrade']['plugin']    = array( __( 'Your attempt to upgrade this plugin: "%s" has failed.' ), 'use_id' );
 
                 $trans['add']['post']          = array( __( 'Your attempt to add this post has failed.' ), false );
@@ -2525 +2525 @@
  */
 function is_ssl() {
-        return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false; 
+        return ( isset($_SERVER['HTTPS']) && 'on' == strtolower($_SERVER['HTTPS']) ) ? true : false;
 }
 

trunk/wp-includes/general-template.php

@@ -374 +374 @@
 
         $link_html = apply_filters( "get_archives_link", $link_html );
-                
+
         return $link_html;
 }
@@ -1198 +1198 @@
 
 /**
- * Enqueues the default ThickBox js and css. 
+ * Enqueues the default ThickBox js and css.
  * If any of the settings need to be changed, this can be done with another js file
  * similar to media-upload.js and theme-preview.js. That file should require array('thickbox')
- * to ensure it is loaded after. 
+ * to ensure it is loaded after.
  */
 function add_thickbox() {

trunk/wp-includes/http.php

@@ -226 +226 @@
         /**
          * Uses the POST HTTP method.
-         * 
+         *
          * Used for sending data that is expected to be in the body.
          *
@@ -245 +245 @@
 
         /**
-         * Uses the GET HTTP method. 
+         * Uses the GET HTTP method.
          *
          * Used for sending data that is expected to be in the body.
@@ -265 +265 @@
 
         /**
-         * Uses the HEAD HTTP method. 
+         * Uses the HEAD HTTP method.
          *
          * Used for sending data that is expected to be in the body.
@@ -345 +345 @@
          *
          * @param string|array $headers
-         * @return array Processed string headers 
+         * @return array Processed string headers
          */
         function processHeaders($headers) {
@@ -358 +358 @@
                                 continue;
 
-                        
+
                         if ( false === strpos($tempheader, ':') ) {
                                 list( , $iResponseCode, $strResponseMsg) = explode(' ', $tempheader, 3);
@@ -661 +661 @@
                         $url = str_replace($arrURL['scheme'], 'http', $url);
 
-                $arrContext = array('http' => 
+                $arrContext = array('http' =>
                         array(
                                 'method' => strtoupper($r['method']),
@@ -896 +896 @@
                 if ( !ini_get('safe_mode') && !ini_get('open_basedir') )
                         curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, true );
-                
+
                 if( ! is_null($headers) )
                         curl_setopt( $handle, CURLOPT_HTTPHEADER, $headers );

trunk/wp-includes/js/autosave.js

@@ -11 +11 @@
         //Disable autosave after the form has been submitted
         $("#post").submit(function() { $.cancel(autosavePeriodical); });
-        
-        // Autosave when the preview button is clicked. 
+
+        // Autosave when the preview button is clicked.
         $('#previewview a').click(function(e) {
                 autosave();
@@ -110 +110 @@
                         jQuery('#previewview').html('<a target="_blank" href="'+permalink+'" tabindex="4">'+previewText+'</a>');
 
-                        // Autosave when the preview button is clicked.  
+                        // Autosave when the preview button is clicked.
                         jQuery('#previewview a').click(function(e) {
                                 autosave();
@@ -131 +131 @@
                                 action: 'sample-permalink',
                                 post_id: post_id,
-                                new_title: jQuery('#title').val(), 
+                                new_title: jQuery('#title').val(),
                                 samplepermalinknonce: jQuery('#samplepermalinknonce').val()
                         },
@@ -181 +181 @@
 
         /* Gotta do this up here so we can check the length when tinyMCE is in use */
-        if ( rich ) {           
+        if ( rich ) {
                 var ed = tinyMCE.activeEditor;
                 if ( 'mce_fullscreen' == ed.id )
@@ -187 +187 @@
                 tinyMCE.get('content').save();
         }
-        
+
         post_data["content"] = jQuery("#content").val();
         if ( jQuery('#post_name').val() )

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

@@ -1 @@
-<?php 
+<?php
 // some code below is from:
 /**
@@ -69 +69 @@
 $plugins = array( 'safari', 'inlinepopups', 'autosave', 'spellchecker', 'paste', 'wordpress', 'media', 'fullscreen', 'wpeditimage' );
 
-/* 
+/*
 The following filter takes an associative array of external plugins for TinyMCE in the form 'plugin_name' => 'url'.
-It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin. 
-The url should be absolute and should include the js file name to be loaded. Example: 
+It adds the plugin's name to TinyMCE's plugins init and the call to PluginManager to load the plugin.
+The url should be absolute and should include the js file name to be loaded. Example:
 array( 'myplugin' => 'http://my-site.com/wp-content/plugins/myfolder/mce_plugin.js' )
 If the plugin uses a button, it should be added with one of the "$mce_buttons" filters.
@@ -80 +80 @@
 $ext_plugins = "\n";
 if ( ! empty($mce_external_plugins) ) {
-        
+
         /*
         The following filter loads external language files for TinyMCE plugins.
-        It takes an associative array 'plugin_name' => 'path', where path is the 
-        include path to the file. The language file should follow the same format as 
-        /tinymce/langs/wp-langs.php and should define a variable $strings that 
-        holds all translated strings. Example: 
+        It takes an associative array 'plugin_name' => 'path', where path is the
+        include path to the file. The language file should follow the same format as
+        /tinymce/langs/wp-langs.php and should define a variable $strings that
+        holds all translated strings. Example:
         $strings = 'tinyMCE.addI18n("' . $mce_locale . '.mypluginname_dlg",{tab_general:"General", ... })';
         */
-        $mce_external_languages = apply_filters('mce_external_languages', array()); 
-        
+        $mce_external_languages = apply_filters('mce_external_languages', array());
+
         $loaded_langs = array();
         $strings = '';
-        
+
         if ( ! empty($mce_external_languages) ) {
                 foreach ( $mce_external_languages as $name => $path ) {
-                        if ( is_file($path) && is_readable($path) ) { 
+                        if ( is_file($path) && is_readable($path) ) {
                                 include_once($path);
                                 $ext_plugins .= $strings;
@@ -105 +105 @@
 
         foreach ( $mce_external_plugins as $name => $url ) {
-                
+
                 if ( is_ssl() ) $url = str_replace('http://', 'https://', $url);
-                
+
                 $plugins[] = '-' . $name;
 
@@ -127 +127 @@
 $mce_buttons_3 = apply_filters('mce_buttons_3', array());
 $mce_buttons_3 = implode($mce_buttons_3, ',');
-        
+
 $mce_buttons_4 = apply_filters('mce_buttons_4', array());
 $mce_buttons_4 = implode($mce_buttons_4, ',');
@@ -196 +196 @@
 
 // Cache path, this is where the .gz files will be stored
-$cache_path = WP_CONTENT_DIR . '/uploads/js_cache'; 
+$cache_path = WP_CONTENT_DIR . '/uploads/js_cache';
 if ( $disk_cache && ! is_dir($cache_path) )
         $disk_cache = wp_mkdir_p($cache_path);
@@ -204 +204 @@
 $theme = ( 'simple' == $initArray['theme'] ) ? 'simple' : 'advanced';
 $language = ( isset($initArray['language']) && ! empty($initArray['language']) ) ? substr( $initArray['language'], 0, 2 ) : 'en';
-$cacheKey = $mce_options = '';  
+$cacheKey = $mce_options = '';
 
 // Check if browser supports gzip
@@ -225 +225 @@
                         $cacheKey .= $n;
         }
-        
+
         $cacheKey = md5( $cacheKey );
         $cache_file = $cache_path . '/tinymce_' . $cacheKey . $cache_ext;
@@ -239 +239 @@
 
         $mtime = gmdate("D, d M Y H:i:s", filemtime($cache_file)) . " GMT";
-        
+
         if ( isset($_SERVER['HTTP_IF_MODIFIED_SINCE']) && $_SERVER['HTTP_IF_MODIFIED_SINCE'] == $mtime ) {
                 header('HTTP/1.1 304 Not Modified');
@@ -248 +248 @@
 
         $content = getFileContents( $cache_file );
-        
+
         if ( '.gz' == $cache_ext )
                 header( 'Content-Encoding: gzip' );
@@ -256 +256 @@
 }
 
-foreach ( $initArray as $k => $v ) 
+foreach ( $initArray as $k => $v )
     $mce_options .= $k . ':"' . $v . '",';
 
@@ -278 +278 @@
 
 // Add plugins
-foreach ( $plugins as $plugin ) 
+foreach ( $plugins as $plugin )
         $content .= getFileContents( 'plugins/' . $plugin . '/editor_plugin.js' );
 
-// Add external plugins 
+// Add external plugins
 $content .= $ext_plugins;
 

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

@@ -8 +8 @@
 <title><?php _e('Rich Editor Help') ?></title>
 <script type="text/javascript" src="tiny_mce_popup.js?ver=311b"></script>
-<?php 
+<?php
 wp_admin_css( 'global', true );
 wp_admin_css( 'wp-admin', true );
@@ -205 +205 @@
                 </script>
         </table>
-        
+
         <p><?php _e('The following shortcuts use different access keys: Alt + Shift + letter.') ?></p>
         <table class="keys" width="100%" style="border: 0 none;">

trunk/wp-includes/l10n.php

@@ -292 +292 @@
 function load_plugin_textdomain($domain, $abs_rel_path = false, $plugin_rel_path = false) {
         $locale = get_locale();
-        
+
         if ( false !== $plugin_rel_path )
                 $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/');

trunk/wp-includes/link-template.php

@@ -86 +86 @@
                         if ( empty($category) ) {
                                 $default_category = get_category( get_option( 'default_category' ) );
-                                $category = is_wp_error( $default_category ) ? '' : $default_category->slug; 
+                                $category = is_wp_error( $default_category ) ? '' : $default_category->slug;
                         }
                 }
@@ -479 +479 @@
                 break;
         endswitch;
-        
+
         return apply_filters( 'get_edit_post_link', admin_url("$file.php?{$action}$var=$post->ID"), $post->ID, $context );
 }
@@ -781 +781 @@
  * @since 2.6
  *
- * Returns the 'site_url' option with the appropriate protocol,  'https' if is_ssl() and 'http' otherwise. 
+ * Returns the 'site_url' option with the appropriate protocol,  'https' if is_ssl() and 'http' otherwise.
  * If $scheme is 'http' or 'https', is_ssl() is overridden.
  *

trunk/wp-includes/media.php

@@ -306 +306 @@
         if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
                 return false;
-                
+
         $data = $imagedata['sizes'][$size];
         // include the full filesystem path of the intermediate file
@@ -320 +320 @@
 // returns an array (url, width, height), or false if no image is available
 function wp_get_attachment_image_src($attachment_id, $size='thumbnail', $icon = false) {
-        
+
         // get a thumbnail or intermediate image if there is one
         if ( $image = image_downsize($attachment_id, $size) )
@@ -347 +347 @@
                 $html = '<img src="'.attribute_escape($src).'" '.$hwstring.'class="attachment-'.attribute_escape($size).'" alt="" />';
         }
-        
+
         return $html;
 }
@@ -367 +367 @@
                 'caption' => ''
         ), $attr));
-        
+
         if ( 1 > (int) $width || empty($caption) )
                 return $content;
-        
+
         if ( $id ) $id = 'id="' . $id . '" ';
-        
+
         return '<div ' . $id . 'class="wp-caption ' . $align . '" style="width: ' . (10 + (int) $width) . 'px">'
         . $content . '<p class="wp-caption-text">' . $caption . '</p></div>';
@@ -423 +423 @@
         $columns = intval($columns);
         $itemwidth = $columns > 0 ? floor(100/$columns) : 100;
-        
+
         $output = apply_filters('gallery_style', "
                 <style type='text/css'>

trunk/wp-includes/pluggable.php

@@ -668 +668 @@
                 } else {
                         wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-                        exit();                 
+                        exit();
                 }
         }
@@ -757 +757 @@
         $location = apply_filters('wp_redirect', $location, $status);
         $status = apply_filters('wp_redirect_status', $status, $location);
-        
+
         if ( !$location ) // allows the wp_redirect filter to cancel a redirect
                 return false;
@@ -830 +830 @@
         // In php 5 parse_url may fail if the URL query part contains http://, bug #38143
         $test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
-        
+
         $lp  = parse_url($test);
         $wpp = parse_url(get_option('home'));
@@ -975 +975 @@
         $notify_message .= sprintf( __('Spam it: %s'), admin_url("comment.php?action=cdc&dt=spam&c=$comment_id") ) . "\r\n";
 
-        $notify_message .= sprintf( __ngettext('Currently %s comment is waiting for approval. Please visit the moderation panel:', 
+        $notify_message .= sprintf( __ngettext('Currently %s comment is waiting for approval. Please visit the moderation panel:',
                 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
         $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";
@@ -1541 +1541 @@
         $left_string  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $left_string );
         $right_string = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $right_string );
-        
+
         $left_lines  = split("\n", $left_string);
         $right_lines = split("\n", $right_string);

trunk/wp-includes/post-template.php

@@ -87 +87 @@
 
         if ( NULL == $more_link_text )
-                $more_link_text = __( '(more...)' ); 
+                $more_link_text = __( '(more...)' );
 
         $output = '';
@@ -451 +451 @@
         if ( !$post = & get_post($id) )
                 return false;
-                
+
         if ( !$src = get_attachment_icon_src( $post->ID, $fullsize ) )
                 return false;

trunk/wp-includes/post.php

@@ -922 +922 @@
 
         array_splice($stickies, $offset, 1);
-        
+
         update_option('sticky_posts', $stickies);
 }
@@ -1446 +1446 @@
                                 return new WP_Error('db_insert_error', __('Could not insert post into the database'), $wpdb->last_error);
                         else
-                                return 0;       
+                                return 0;
                 }
                 $post_ID = (int) $wpdb->insert_id;
@@ -2149 +2149 @@
         if ( ! empty( $meta_key ) || ! empty( $meta_value ) ) {
                 $join = " LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )";
-                
-                // meta_key and met_value might be slashed 
+
+                // meta_key and met_value might be slashed
                 $meta_key = stripslashes($meta_key);
                 $meta_value = stripslashes($meta_value);
@@ -2343 +2343 @@
         if ( $file )
                 update_attached_file( $post_ID, $file );
-                
+
         clean_post_cache($post_ID);
 
@@ -2535 +2535 @@
         if ( !$url = wp_get_attachment_url( $post->ID ) )
                 return false;
-                
+
         $sized = image_downsize( $post_id, 'thumbnail' );
         if ( $sized )

trunk/wp-includes/query.php

@@ -122 +122 @@
 function is_tax( $slug = '' ) {
         global $wp_query;
-        
+
         if ( !$wp_query->is_tax )
                 return false;
@@ -1359 +1359 @@
                 if ( ! empty($q['meta_key']) || ! empty($q['meta_value']) )
                         $join .= " LEFT JOIN $wpdb->postmeta ON ($wpdb->posts.ID = $wpdb->postmeta.post_id) ";
-                if ( ! empty($q['meta_key']) ) 
+                if ( ! empty($q['meta_key']) )
                         $where .= $wpdb->prepare("AND $wpdb->postmeta.meta_key = %s ", $q['meta_key']);
                 if ( ! empty($q['meta_value']) )

trunk/wp-includes/rewrite.php

@@ -65 +65 @@
   * @param string $base the taxonomy base that we're going to filter
   * @return string
-  * @author Mark Jaquith 
+  * @author Mark Jaquith
   */
 function _wp_filter_taxonomy_base( $base ) {

trunk/wp-includes/script-loader.php

@@ -194 +194 @@
                         'count' => __('Word count: %d')
                 ));
-                
+
                 $scripts->add( 'wp-gears', '/wp-admin/js/wp-gears.js', false, '20080721' );
                 $scripts->localize( 'wp-gears', 'wpGearsL10n', array(
@@ -200 +200 @@
                         'error' => __('Error:')
                 ));
-                
+
                 $scripts->add( 'theme-preview', '/wp-admin/js/theme-preview.js', array( 'thickbox', 'jquery' ), '20080625' );
 
@@ -207 +207 @@
                         'plugin_information' => __('Plugin Information:')
                 ) );
-                 
+
         }
 }

trunk/wp-includes/shortcodes.php

@@ -49 +49 @@
  * plugin has a similar shortcode, it will override yours or yours will override
  * theirs depending on which order the plugins are included and/or ran.
- * 
+ *
  * Simplest example of a shortcode tag using the API:
  *
@@ -205 +205 @@
  * @since 2.5
  *
- * @param string $text 
+ * @param string $text
  * @return array List of attributes and their value.
  */
@@ -279 +279 @@
 }
 
-add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop() 
+add_filter('the_content', 'do_shortcode', 11); // AFTER wpautop()
 
 ?>

trunk/wp-includes/taxonomy.php

@@ -785 +785 @@
                 if ( $result = $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $where AND tt.taxonomy = %s", $slug, $taxonomy), ARRAY_A) )
                         return $result;
-                        
+
                 return $wpdb->get_row( $wpdb->prepare("SELECT tt.term_id, tt.term_taxonomy_id FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy as tt ON tt.term_id = t.term_id WHERE $else_where AND tt.taxonomy = %s", $term, $taxonomy), ARRAY_A);
         }

trunk/wp-includes/theme.php

@@ -234 +234 @@
                 $stylesheet_files = array();
                 $template_files = array();
-                
+
                 $stylesheet_dir = @ dir("$theme_root/$stylesheet");
                 if ( $stylesheet_dir ) {

trunk/wp-includes/user.php

@@ -24 +24 @@
         if ( '' === $secure_cookie )
                 $secure_cookie = is_ssl() ? true : false;
-        
+
         // If no credential info provided, check cookie.
         if ( empty($credentials['user_login']) && empty($credentials['user_password']) ) {
@@ -103 +103 @@
         else // Blog global
                 $result = get_option( $option );
-        
+
         return apply_filters("get_user_option_{$option}", $result, $option, $user);
 }

trunk/wp-includes/widgets.php

@@ -167 +167 @@
 function wp_register_widget_control($id, $name, $control_callback, $options = array()) {
         global $wp_registered_widget_controls;
-        
+
         $id = strtolower($id);
 
@@ -463 +463 @@
         extract($args);
         $searchform_template = get_template_directory() . '/searchform.php';
-        
+
         echo $before_widget;
-        
+
         // Use current theme search form if it exists
         if ( file_exists($searchform_template) ) {
@@ -476 +476 @@
                 </div></form>
         <?php }
-        
+
         echo $after_widget;
 }
@@ -744 +744 @@
 ?>
                 <ul>
-                <?php 
+                <?php
                         $cat_args['title_li'] = '';
-                        wp_list_categories($cat_args); 
+                        wp_list_categories($cat_args);
                 ?>
                 </ul>

trunk/wp-includes/wp-db.php

@@ -340 +340 @@
                                         $collation_query .= " COLLATE '{$this->collate}'";
                         }
-                        
+
                         if ( !empty($collation_query) )
                                 $this->query($collation_query);
-                        
-                }
-                
+
+                }
+
                 $this->select($dbname);
         }
@@ -686 +686 @@
                 else
                         return false;
-                        
+
                 return $this->query( "UPDATE $table SET " . implode( ', ', $bits ) . ' WHERE ' . implode( ' AND ', $wheres ) );
         }

trunk/wp-login.php

@@ -19 +19 @@
         } else {
                 wp_redirect('https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
-                exit();                 
+                exit();
         }
 }
@@ -136 +136 @@
         else if ( is_wp_error($allow) )
                 return $allow;
-                
+
         $key = $wpdb->get_var($wpdb->prepare("SELECT user_activation_key FROM $wpdb->users WHERE user_login = %s", $user_login));
         if ( empty($key) ) {

trunk/wp-settings.php

@@ -436 +436 @@
 if ( !defined( 'AUTOSAVE_INTERVAL' ) )
         define( 'AUTOSAVE_INTERVAL', 60 );
-        
+
 
 require (ABSPATH . WPINC . '/vars.php');

trunk/xmlrpc.php

@@ -1014 +1014 @@
                 // We've got all the data -- post it:
                 $comment = compact('comment_ID', 'comment_content', 'comment_approved', 'comment_date', 'comment_date_gmt', 'comment_author', 'comment_author_email', 'comment_author_url');
-                
+
                 $result = wp_update_comment($comment);
                 if ( is_wp_error( $result ) )
@@ -1093 +1093 @@
 
                 do_action('xmlrpc_call', 'wp.newComment');
-                
+
                 return wp_new_comment($comment);
         }
@@ -1882 +1882 @@
                 }
 
-                // Handle enclosures 
-                $enclosure = $content_struct['enclosure']; 
-                if( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) { 
+                // Handle enclosures
+                $enclosure = $content_struct['enclosure'];
+                if( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {
                         add_post_meta( $post_ID, 'enclosure', $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] );
-                } 
+                }
 
                 $this->attach_uploads( $post_ID, $post_content );
@@ -2150 +2150 @@
                 }
 
-                // Handle enclosures 
-                $enclosure = $content_struct['enclosure']; 
-                if( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) { 
+                // Handle enclosures
+                $enclosure = $content_struct['enclosure'];
+                if( is_array( $enclosure ) && isset( $enclosure['url'] ) && isset( $enclosure['length'] ) && isset( $enclosure['type'] ) ) {
                         add_post_meta( $post_ID, 'enclosure', $enclosure['url'] . "\n" . $enclosure['length'] . "\n" . $enclosure['type'] );
-                } 
+                }
 
                 $this->attach_uploads( $ID, $post_content );