Changeset 11930

Timestamp:

09/14/2009 02:03:32 PM (17 years ago)

Author:

ryan

Message:

Remove trailing whitespace

Location:

trunk

Files:

• wp-admin/comment.php (modified) (3 diffs)
• wp-admin/edit-comments.php (modified) (2 diffs)
• wp-admin/edit-pages.php (modified) (2 diffs)
• wp-admin/edit.php (modified) (2 diffs)
• wp-admin/includes/class-pclzip.php (modified) (100 diffs)
• wp-admin/includes/class-wp-filesystem-direct.php (modified) (13 diffs)
• wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (1 diff)
• wp-admin/includes/class-wp-filesystem-ftpsockets.php (modified) (1 diff)
• wp-admin/includes/class-wp-filesystem-ssh2.php (modified) (1 diff)
• wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)
• wp-admin/includes/export.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-admin/includes/image-edit.php (modified) (1 diff)
• wp-admin/includes/plugin.php (modified) (4 diffs)
• wp-admin/includes/post.php (modified) (3 diffs)
• wp-admin/includes/template.php (modified) (1 diff)
• wp-admin/install.php (modified) (1 diff)
• wp-admin/media.php (modified) (1 diff)
• wp-admin/menu-header.php (modified) (1 diff)
• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/upgrade.php (modified) (1 diff)
• wp-admin/upload.php (modified) (5 diffs)
• wp-admin/user-edit.php (modified) (1 diff)
• wp-app.php (modified) (2 diffs)
• wp-includes/canonical.php (modified) (1 diff)
• wp-includes/class-json.php (modified) (1 diff)
• wp-includes/classes.php (modified) (6 diffs)
• wp-includes/comment-template.php (modified) (1 diff)
• wp-includes/comment.php (modified) (2 diffs)
• wp-includes/formatting.php (modified) (4 diffs)
• wp-includes/functions.php (modified) (6 diffs)
• wp-includes/http.php (modified) (1 diff)
• wp-includes/kses.php (modified) (1 diff)
• wp-includes/link-template.php (modified) (1 diff)
• wp-includes/media.php (modified) (3 diffs)
• wp-includes/pluggable.php (modified) (1 diff)
• wp-includes/post.php (modified) (8 diffs)
• wp-includes/query.php (modified) (1 diff)
• wp-includes/registration.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-includes/theme.php (modified) (1 diff)
• wp-includes/user.php (modified) (1 diff)
• wp-includes/wp-db.php (modified) (1 diff)
• wp-login.php (modified) (1 diff)

trunk/wp-admin/comment.php

@@ -47 +47 @@
         if ( 'trash' == $comment->comment_approved )
                 comment_footer_die( __('This comment is in the Trash. Please move it out of the Trash if you want to edit it.') );
-        
+
         $comment = get_comment_to_edit( $comment_id );
 
@@ -171 +171 @@
         $comment_id = absint( $_REQUEST['c'] );
         $noredir = isset($_REQUEST['noredir']);
-        
+
         if (!$comment = get_comment($comment_id))
                 comment_footer_die( __('Oops, no comment with this ID.') . sprintf(' <a href="%s">'.__('Go back').'</a>!', 'edit-comments.php') );
         if (!current_user_can('edit_post', $comment->comment_post_ID ))
                 comment_footer_die( __('You are not allowed to edit comments on this post.') );
-        
+
         if ($action == 'trashcomment') {
                 check_admin_referer( 'trash-comment_' . $comment_id );
@@ -185 +185 @@
                 wp_untrash_comment($comment_id);
         }
-        
+
         if ('' != wp_get_referer() && false == $noredir && false === strpos(wp_get_referer(), 'comment.php' ))
                 wp_redirect( wp_get_referer() );

trunk/wp-admin/edit-comments.php

@@ -20 +20 @@
 if ( isset($_REQUEST['doaction']) ||  isset($_REQUEST['doaction2']) || isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']) ) {
         check_admin_referer('bulk-comments');
-        
+
         if ((isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2'])) && !empty($_REQUEST['pagegen_timestamp'])) {
                 $comment_status = $wpdb->escape($_REQUEST['comment_status']);
@@ -30 +30 @@
                 $doaction = ($_REQUEST['action'] != -1) ? $_REQUEST['action'] : $_REQUEST['action2'];
         } else wp_redirect($_SERVER['HTTP_REFERER']);
-        
+
         $approved = $unapproved = $spammed = $trashed = $untrashed = $deleted = 0;
-        
+
         foreach ($comment_ids as $comment_id) { // Check the permissions on each
                 $_post_id = (int) $wpdb->get_var( $wpdb->prepare( "SELECT comment_post_ID FROM $wpdb->comments WHERE comment_ID = %d", $comment_id) );

trunk/wp-admin/edit-pages.php

@@ -41 +41 @@
                                 if ( !wp_trash_post($post_id) )
                                         wp_die( __('Error in moving to trash...') );
-                                
+
                                 $trashed++;
                         }
@@ -54 +54 @@
                                 if ( !wp_untrash_post($post_id) )
                                         wp_die( __('Error in restoring from trash...') );
-                                
+
                                 $untrashed++;
                         }

trunk/wp-admin/edit.php

@@ -49 +49 @@
                                 if ( !wp_trash_post($post_id) )
                                         wp_die( __('Error in moving to trash...') );
-                                
+
                                 $trashed++;
                         }
@@ -62 +62 @@
                                 if ( !wp_untrash_post($post_id) )
                                         wp_die( __('Error in restoring from trash...') );
-                                
+
                                 $untrashed++;
                         }

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

@@ -30 +30 @@
     define( 'PCLZIP_READ_BLOCK_SIZE', 2048 );
   }
-  
+
   // ----- File list separator
   // In version 1.x of PclZip, the separator for file list is a space
@@ -69 +69 @@
   // ----- Optional threshold ratio for use of temporary files
   //       Pclzip sense the size of the file to add/extract and decide to
-  //       use or not temporary file. The algorythm is looking for 
+  //       use or not temporary file. The algorythm is looking for
   //       memory_limit of PHP and apply a ratio.
   //       threshold = memory_limit * ratio.
@@ -153 +153 @@
   define( 'PCLZIP_OPT_TEMP_FILE_OFF', 77022 );
   define( 'PCLZIP_OPT_ADD_TEMP_FILE_OFF', 77022 ); // alias
-  
+
   // ----- File description attributes
   define( 'PCLZIP_ATT_FILE_NAME', 79001 );
@@ -199 +199 @@
     var $error_code = 1;
     var $error_string = '';
-    
+
     // ----- Current status of the magic_quotes_runtime
     // This value store the php configuration for magic_quotes
@@ -342 +342 @@
       }
     }
-    
+
     // ----- Look for default option values
     $this->privOptionDefaultThreshold($v_options);
@@ -351 +351 @@
     $v_filedescr_list = array();
     $p_result_list = array();
-    
+
     // ----- Look if the $p_filelist is really an array
     if (is_array($p_filelist)) {
-    
+
       // ----- Look if the first element is also an array
       //       This will mean that this is a file description entry
@@ -360 +360 @@
         $v_att_list = $p_filelist;
       }
-      
+
       // ----- The list is a list of string names
       else {
@@ -379 +379 @@
       return 0;
     }
-    
+
     // ----- Reformat the string list
     if (sizeof($v_string_list) != 0) {
@@ -391 +391 @@
       }
     }
-    
+
     // ----- For each file in the list check the attributes
     $v_supported_attributes
@@ -550 +550 @@
     $v_filedescr_list = array();
     $p_result_list = array();
-    
+
     // ----- Look if the $p_filelist is really an array
     if (is_array($p_filelist)) {
-    
+
       // ----- Look if the first element is also an array
       //       This will mean that this is a file description entry
@@ -559 +559 @@
         $v_att_list = $p_filelist;
       }
-      
+
       // ----- The list is a list of string names
       else {
@@ -578 +578 @@
       return 0;
     }
-    
+
     // ----- Reformat the string list
     if (sizeof($v_string_list) != 0) {
@@ -585 +585 @@
       }
     }
-    
+
     // ----- For each file in the list check the attributes
     $v_supported_attributes
@@ -1050 +1050 @@
   //   PCLZIP_OPT_BY_INDEX :
   //   PCLZIP_OPT_BY_NAME :
-  //   PCLZIP_OPT_BY_EREG : 
+  //   PCLZIP_OPT_BY_EREG :
   //   PCLZIP_OPT_BY_PREG :
   // Return Values :
@@ -1125 +1125 @@
   {
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::deleteByIndex", "index='$p_index'");
-    
+
     $p_list = $this->delete(PCLZIP_OPT_BY_INDEX, $p_index);
 
@@ -1179 +1179 @@
       {
         $this->privSwapBackMagicQuotes();
-        
+
         // ----- Error log
         PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
@@ -1508 +1508 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privParseOptions", "");
     $v_result=1;
-    
+
     // ----- Read the options
     $i=0;
@@ -1553 +1553 @@
             return PclZip::errorCode();
           }
-          
+
           // ----- Check for incompatible options
           if (isset($v_result_list[PCLZIP_OPT_TEMP_FILE_OFF])) {
@@ -1560 +1560 @@
             return PclZip::errorCode();
           }
-          
+
           // ----- Check the value
           $v_value = $p_options_list[$i+1];
@@ -1582 +1582 @@
             return PclZip::errorCode();
           }
-          
+
           $v_result_list[$p_options_list[$i]] = true;
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
@@ -1600 +1600 @@
             return PclZip::errorCode();
           }
-          
+
           $v_result_list[$p_options_list[$i]] = true;
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($p_options_list[$i])." = '".$v_result_list[$p_options_list[$i]]."'");
@@ -1764 +1764 @@
             return PclZip::errorCode();
           }
-          
+
           // ----- Reduce the index list
           // each index item in the list must be a couple with a start and
@@ -1775 +1775 @@
               $v_item_list = explode("-", $v_work_list[$j]);
               $v_size_item_list = sizeof($v_item_list);
-              
+
               // ----- TBC : Here we might check that each item is a
               // real integer ...
-              
+
               // ----- Look for single value
               if ($v_size_item_list == 1) {
@@ -1816 +1816 @@
               $v_sort_value = $v_result_list[$p_options_list[$i]][$j]['start'];
           }
-          
+
           // ----- Sort the items
           if ($v_sort_flag) {
@@ -1929 +1929 @@
       }
     }
-    
+
     // ----- Look for default values
     if (!isset($v_result_list[PCLZIP_OPT_TEMP_FILE_THRESHOLD])) {
       //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Calculate auto threshold");
-      
+
     }
 
@@ -1952 +1952 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privOptionDefaultThreshold", "");
     $v_result=1;
-    
+
     if (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
         || isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) {
@@ -1958 +1958 @@
       return $v_result;
     }
-    
+
     //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Create an auto-threshold for use of temporay files");
     // ----- Get 'memory_limit' configuration value
@@ -1964 +1964 @@
     $v_memory_limit = trim($v_memory_limit);
     $last = strtolower(substr($v_memory_limit, -1));
- 
+
     if($last == 'g')
         //$v_memory_limit = $v_memory_limit*1024*1024*1024;
@@ -1973 +1973 @@
     if($last == 'k')
         $v_memory_limit = $v_memory_limit*1024;
-            
+
     $p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD] = floor($v_memory_limit*PCLZIP_TEMPORARY_FILE_RATIO);
-    
+
     //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Current memory usage : ".memory_get_usage(TRUE)." bytes");
     //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3,"Threshold value is : ".$p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]." bytes");
@@ -1984 +1984 @@
       unset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD]);
     }
-          
+
     // ----- Return
     //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
@@ -2003 +2003 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privFileDescrParseAtt", "");
     $v_result=1;
-    
+
     // ----- For each file in the list check the attributes
     foreach ($p_file_list as $v_key => $v_value) {
-    
+
       // ----- Check if the option is supported
       if (!isset($v_requested_options[$v_key])) {
@@ -2028 +2028 @@
           $p_filedescr['filename'] = PclZipUtilPathReduction($v_value);
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "".PclZipUtilOptionText($v_key)." = '".$v_value."'");
-          
+
           if ($p_filedescr['filename'] == '') {
             PclZip::privErrorLog(PCLZIP_ERR_INVALID_ATTRIBUTE_VALUE, "Invalid empty filename for attribute '".PclZipUtilOptionText($v_key)."'");
@@ -2124 +2124 @@
         }
       }
-    
+
     // end foreach
     }
-    
+
     // ----- Return
     //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
@@ -2141 +2141 @@
   //   just ignore the item.
   //   Then prepare the information that will be stored for that file.
-  //   When its a folder, expand the folder with all the files that are in that 
+  //   When its a folder, expand the folder with all the files that are in that
   //   folder (recursively).
   // Parameters :
@@ -2152 +2152 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privFileDescrExpand", "");
     $v_result=1;
-    
+
     // ----- Create a result list
     $v_result_list = array();
-    
+
     // ----- Look each entry
     for ($i=0; $i<sizeof($p_filedescr_list); $i++) {
       //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Looking for file ".$i.".");
-      
+
       // ----- Get filedescr
       $v_descr = $p_filedescr_list[$i];
-      
+
       // ----- Reduce the filename
       //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filedescr before reduction :'".$v_descr['filename']."'");
@@ -2168 +2168 @@
       $v_descr['filename'] = PclZipUtilPathReduction($v_descr['filename']);
       //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Filedescr after reduction :'".$v_descr['filename']."'");
-      
+
       // ----- Look for real file or folder
       if (file_exists($v_descr['filename'])) {
@@ -2190 +2190 @@
         }
       }
-      
+
       // ----- Look for string added as file
       else if (isset($v_descr['content'])) {
@@ -2196 +2196 @@
         $v_descr['type'] = 'virtual_file';
       }
-      
+
       // ----- Missing file
       else {
@@ -2207 +2207 @@
         return PclZip::errorCode();
       }
-      
+
       // ----- Calculate the stored filename
       $this->privCalculateStoredFilename($v_descr, $p_options);
-      
+
       // ----- Add the descriptor in result list
       $v_result_list[sizeof($v_result_list)] = $v_descr;
-      
+
       // ----- Look for folder
       if ($v_descr['type'] == 'folder') {
@@ -2227 +2227 @@
                 continue;
             }
-            
+
             // ----- Compose the full filename
             $v_dirlist_descr[$v_dirlist_nb]['filename'] = $v_descr['filename'].'/'.$v_item_handler;
-            
+
             // ----- Look for different stored filename
             // Because the name of the folder was changed, the name of the
@@ -2242 +2242 @@
               }
             }
-      
+
             $v_dirlist_nb++;
           }
-          
+
           @closedir($v_folder_handler);
         }
@@ -2252 +2252 @@
           // TBC : unable to open folder in read mode
         }
-        
+
         // ----- Expand each element of the list
         if ($v_dirlist_nb != 0) {
@@ -2260 +2260 @@
             return $v_result;
           }
-          
+
           // ----- Concat the resulting list
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Merging result list (size '".sizeof($v_result_list)."') with dirlist (size '".sizeof($v_dirlist_descr)."')");
@@ -2269 +2269 @@
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Nothing in this folder to expand.");
         }
-          
+
         // ----- Free local array
         unset($v_dirlist_descr);
       }
     }
-    
+
     // ----- Get the result list
     $p_filedescr_list = $v_result_list;
@@ -2295 +2295 @@
     $v_result=1;
     $v_list_detail = array();
-    
+
     // ----- Magic quotes trick
     $this->privDisableMagicQuotes();
@@ -2656 +2656 @@
   // Description :
   // Parameters :
-  //   $p_filedescr_list : An array containing the file description 
+  //   $p_filedescr_list : An array containing the file description
   //                      or directory names to add in the zip
   //   $p_result_list : list of added files with their properties (specially the status field)
@@ -2676 +2676 @@
       $p_filedescr_list[$j]['filename']
       = PclZipUtilTranslateWinPath($p_filedescr_list[$j]['filename'], false);
-      
+
       //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Looking for file '".$p_filedescr_list[$j]['filename']."'");
 
@@ -2736 +2736 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFile", "filename='".$p_filedescr['filename']."'");
     $v_result=1;
-    
+
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -2749 +2749 @@
       return PclZip::errorCode();
     }
-  
-    // ----- Look for a stored different filename 
+
+    // ----- Look for a stored different filename
     /* TBC : Removed
     if (isset($p_filedescr['stored_filename'])) {
@@ -2787 +2787 @@
       $p_header['size'] = filesize($p_filename);
     }
-    
+
     // ----- Look for regular folder
     else if ($p_filedescr['type']=='folder') {
@@ -2794 +2794 @@
       $p_header['size'] = filesize($p_filename);
     }
-    
+
     // ----- Look for virtual file
     else if ($p_filedescr['type'] == 'virtual_file') {
@@ -2800 +2800 @@
       $p_header['size'] = strlen($p_filedescr['content']);
     }
-    
+
     //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Header external extension '".sprintf("0x%X",$p_header['external'])."'");
 
@@ -2856 +2856 @@
       $p_header['status'] = "filtered";
     }
-    
+
     // ----- Check the path length
     if (strlen($p_header['stored_filename']) > 0xFF) {
@@ -2868 +2868 @@
       if ($p_filedescr['type'] == 'file') {
         // ----- Look for using temporary file to zip
-        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+        if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
             && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                 || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
@@ -2877 +2877 @@
           }
         }
-        
+
         // ----- Use "in memory" zip algo
         else {
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"In memory compression.");      
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Current memory usage : ".memory_get_usage(TRUE)." bytes");      
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Current memory peak : ".memory_get_peak_usage(TRUE)." bytes");      
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"In memory compression.");
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Current memory usage : ".memory_get_usage(TRUE)." bytes");
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Current memory peak : ".memory_get_peak_usage(TRUE)." bytes");
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "'".$p_filename."' is a file");
 
@@ -2894 +2894 @@
         // ----- Read the file content
         $v_content = @fread($v_file, $p_header['size']);
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory usage after reading file : ".memory_get_usage(TRUE)." bytes");      
-        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory peak after reading file : ".memory_get_peak_usage(TRUE)." bytes");      
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory usage after reading file : ".memory_get_usage(TRUE)." bytes");
+        //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory peak after reading file : ".memory_get_peak_usage(TRUE)." bytes");
 
         // ----- Close the file
@@ -2902 +2902 @@
         // ----- Calculate the CRC
         $p_header['crc'] = @crc32($v_content);
-        
+
         // ----- Look for no compression
         if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
@@ -2910 +2910 @@
           $p_header['compression'] = 0;
         }
-        
+
         // ----- Look for normal compression
         else {
@@ -2916 +2916 @@
           // ----- Compress the content
           $v_content = @gzdeflate($v_content);
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory usage after gzdeflate : ".memory_get_usage(TRUE)." bytes");      
-          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory peak after gzdeflate : ".memory_get_peak_usage(TRUE)." bytes");      
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory usage after gzdeflate : ".memory_get_usage(TRUE)." bytes");
+          //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2,"Memory peak after gzdeflate : ".memory_get_peak_usage(TRUE)." bytes");
 
           // ----- Set header parameters
@@ -2923 +2923 @@
           $p_header['compression'] = 8;
         }
-        
+
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
@@ -2940 +2940 @@
       // ----- Look for a virtual file (a file from string)
       else if ($p_filedescr['type'] == 'virtual_file') {
-          
+
         //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Add by string");
         $v_content = $p_filedescr['content'];
@@ -2946 +2946 @@
         // ----- Calculate the CRC
         $p_header['crc'] = @crc32($v_content);
-        
+
         // ----- Look for no compression
         if ($p_options[PCLZIP_OPT_NO_COMPRESSION]) {
@@ -2954 +2954 @@
           $p_header['compression'] = 0;
         }
-        
+
         // ----- Look for normal compression
         else {
@@ -2965 +2965 @@
           $p_header['compression'] = 8;
         }
-        
+
         // ----- Call the header generation
         if (($v_result = $this->privWriteFileHeader($p_header)) != 1) {
@@ -3036 +3036 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privAddFileUsingTempFile", "filename='".$p_filedescr['filename']."'");
     $v_result=PCLZIP_ERR_NO_ERROR;
-    
+
     // ----- Working variable
     $p_filename = $p_filedescr['filename'];
@@ -3154 +3154 @@
     // ----- Unlink the temporary file
     @unlink($v_gzip_temp_name);
-    
+
     // ----- Return
     //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
@@ -3173 +3173 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZip::privCalculateStoredFilename", "filename='".$p_filedescr['filename']."'");
     $v_result=1;
-    
+
     // ----- Working variables
     $p_filename = $p_filedescr['filename'];
@@ -3202 +3202 @@
       //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 4, "Changing full name of '".$p_filename."' for '".$v_stored_filename."'");
     }
-    
+
     // ----- Look for path and/or short name change
     else {
@@ -3235 +3235 @@
         if (   (substr($p_filename, 0, 2) == "./")
             || (substr($p_remove_dir, 0, 2) == "./")) {
-            
+
           if (   (substr($p_filename, 0, 2) == "./")
               && (substr($p_remove_dir, 0, 2) != "./")) {
@@ -3261 +3261 @@
         }
       }
-      
+
       // ----- Remove drive letter if any
       $v_stored_filename = PclZipUtilTranslateWinPath($v_stored_filename);
-      
+
       // ----- Look for path to add
       if ($p_add_dir != "") {
@@ -3279 +3279 @@
     $p_filedescr['stored_filename'] = $v_stored_filename;
     //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Stored filename will be '".$p_filedescr['stored_filename']."', strlen ".strlen($p_filedescr['stored_filename']));
-    
+
     // ----- Return
     //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
@@ -3444 +3444 @@
       // ----- Magic quotes trick
       $this->privSwapBackMagicQuotes();
-      
+
       // ----- Error log
       PclZip::privErrorLog(PCLZIP_ERR_READ_OPEN_FAIL, 'Unable to open archive \''.$this->zipname.'\' in binary read mode');
@@ -3727 +3727 @@
                && ($p_options[PCLZIP_OPT_BY_INDEX] != 0)) {
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, "Extract with rule 'ByIndex'");
-          
+
           // ----- Look if the index is in the list
           for ($j=$j_start; ($j<sizeof($p_options[PCLZIP_OPT_BY_INDEX])) && (!$v_extract); $j++) {
@@ -3767 +3767 @@
 
               $this->privSwapBackMagicQuotes();
-              
+
               PclZip::privErrorLog(PCLZIP_ERR_UNSUPPORTED_COMPRESSION,
                                                "Filename '".$v_header['stored_filename']."' is "
@@ -3777 +3777 @@
                   }
           }
-          
+
           // ----- Check encrypted files
           if (($v_extract) && (($v_header['flag'] & 1) == 1)) {
@@ -3814 +3814 @@
           $v_extract = false;
       }
-      
+
       // ----- Look for real extraction
       if ($v_extract)
@@ -3868 +3868 @@
           // ----- Next extracted file
           $v_nb_extracted++;
-          
+
           // ----- Look for user callback abort
           if ($v_result1 == 2) {
@@ -4020 +4020 @@
       $p_entry['filename'] = $p_path."/".$p_entry['filename'];
     }
-    
+
     // ----- Check a base_dir_restriction
     if (isset($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION])) {
@@ -4026 +4026 @@
       $v_inclusion
       = PclZipUtilPathInclusion($p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION],
-                                $p_entry['filename']); 
+                                $p_entry['filename']);
       if ($v_inclusion == 0) {
         //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "PCLZIP_OPT_EXTRACT_DIR_RESTRICTION is selected, file is outside restriction");
@@ -4056 +4056 @@
         $v_result = 1;
       }
-      
+
       // ----- Look for abort result
       if ($v_result == 2) {
@@ -4088 +4088 @@
         // ----- Change the file status
         $p_entry['status'] = "already_a_directory";
-        
+
         // ----- Look for PCLZIP_OPT_STOP_ON_ERROR
         // For historical reason first PclZip implementation does not stop
@@ -4173 +4173 @@
         if (($v_result = $this->privDirCheck($v_dir_to_check, (($p_entry['external']&0x00000010)==0x00000010))) != 1) {
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to create path for '".$p_entry['filename']."'");
-  
+
           // ----- Change the file status
           $p_entry['status'] = "path_creation_fail";
-  
+
           // ----- Return
           ////--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
@@ -4221 +4221 @@
             @fwrite($v_dest_file, $v_binary_data, $v_read_size);
             */
-            @fwrite($v_dest_file, $v_buffer, $v_read_size);            
+            @fwrite($v_dest_file, $v_buffer, $v_read_size);
             $v_size -= $v_read_size;
           }
@@ -4230 +4230 @@
           // ----- Change the file mtime
           touch($p_entry['filename'], $p_entry['mtime']);
-          
+
 
         }
@@ -4246 +4246 @@
 
           // ----- Look for using temporary file to unzip
-          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF])) 
+          if ( (!isset($p_options[PCLZIP_OPT_TEMP_FILE_OFF]))
               && (isset($p_options[PCLZIP_OPT_TEMP_FILE_ON])
                   || (isset($p_options[PCLZIP_OPT_TEMP_FILE_THRESHOLD])
@@ -4255 +4255 @@
             }
           }
-          
+
           // ----- Look for extract in memory
           else {
 
             //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 5, "Read '".$p_entry['compressed_size']."' compressed bytes");
-          
+
             // ----- Read the compressed file in a buffer (one shot)
             $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-            
+
             // ----- Decompress the file
             $v_file_content = @gzinflate($v_buffer);
@@ -4269 +4269 @@
             if ($v_file_content === FALSE) {
               //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Unable to inflate compressed file");
-  
+
               // ----- Change the file status
               // TBC
               $p_entry['status'] = "error";
-              
+
               //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
               return $v_result;
             }
-            
+
             // ----- Opening destination file
             if (($v_dest_file = @fopen($p_entry['filename'], 'wb')) == 0) {
               //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 2, "Error while opening '".$p_entry['filename']."' in write binary mode");
-  
+
               // ----- Change the file status
               $p_entry['status'] = "write_error";
-  
+
               //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
               return $v_result;
             }
-  
+
             // ----- Write the uncompressed data
             @fwrite($v_dest_file, $v_file_content, $p_entry['size']);
             unset($v_file_content);
-  
+
             // ----- Closing the destination file
             @fclose($v_dest_file);
-            
+
           }
 
@@ -4318 +4318 @@
       $p_entry['status'] = "skipped";
         }
-        
+
     // ----- Look for post-extract callback
     elseif (isset($p_options[PCLZIP_CB_POST_EXTRACT])) {
@@ -4355 +4355 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, 'PclZip::privExtractFileUsingTempFile', "filename='".$p_entry['filename']."'");
     $v_result=1;
-        
+
     // ----- Creates a temporary file
     $v_gzip_temp_name = PCLZIP_TEMPORARY_DIR.uniqid('pclzip-').'.gz';
@@ -4427 +4427 @@
     // ----- Delete the temporary file
     @unlink($v_gzip_temp_name);
-    
+
     // ----- Return
     //--(MAGIC-PclTrace)--//PclTraceFctEnd(__FILE__, __LINE__, $v_result);
@@ -4516 +4516 @@
           // ----- Read the compressed file in a buffer (one shot)
           $v_buffer = @fread($this->zip_fd, $p_entry['compressed_size']);
-          
+
           // ----- Decompress the file
           $v_file_content = gzinflate($v_buffer);
@@ -4605 +4605 @@
         // ----- Reading the file
         $v_data = @fread($this->zip_fd, $p_entry['compressed_size']);
-        
+
         // ----- Decompress the file
         if (($p_string = @gzinflate($v_data)) === FALSE) {
@@ -4922 +4922 @@
           //--(MAGIC-PclTrace)--//PclTraceFctMessage(__FILE__, __LINE__, 3, 'Bad check "filename_len" : TBC To Be Completed');
         }
-  
+
         // ----- Look for flag bit 3
         if (($p_local_header['flag'] & 8) == 8) {
@@ -5027 +5027 @@
         // -----  Add the byte
         // $v_bytes = ($v_bytes << 8) | Ord($v_byte);
-        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number 
-        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail. 
-        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte); 
+        // Note we mask the old value down such that once shifted we can never end up with more than a 32bit number
+        // Otherwise on systems where we have 64bit integers the check below for the magic number will fail.
+        $v_bytes = ( ($v_bytes & 0xFFFFFF) << 8) | Ord($v_byte);
 
         // ----- Compare the bytes
@@ -5364 +5364 @@
                 return $v_result;
             }
-            
+
             // ----- Check that local file header is same as central file header
             if ($this->privCheckFileHeaders($v_local_header,
@@ -5457 +5457 @@
         //@rename($v_zip_temp_name, $this->zipname);
         PclZipUtilRename($v_zip_temp_name, $this->zipname);
-    
+
         // ----- Destroy the temporary archive
         unset($v_temp_zip);
     }
-    
+
     // ----- Remove every files : reset the file
     else if ($v_central_dir['entries'] != 0) {
@@ -6009 +6009 @@
         }
       }
-      
+
       // ----- Look for skip
       if ($v_skip > 0) {
@@ -6044 +6044 @@
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilPathInclusion", "dir='$p_dir', path='$p_path'");
     $v_result = 1;
-    
+
     // ----- Look for path beginning by ./
     if (   ($p_dir == '.')
@@ -6235 +6235 @@
   {
     //--(MAGIC-PclTrace)--//PclTraceFctStart(__FILE__, __LINE__, "PclZipUtilOptionText", "option='".$p_option."'");
-    
+
     $v_list = get_defined_constants();
     for (reset($v_list); $v_key = key($v_list); next($v_list)) {
@@ -6247 +6247 @@
             }
     }
-    
+
     $v_result = 'Unknown';
 

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

@@ -19 +19 @@
         /**
          * constructor
-         * 
+         *
          * @param $arg mixed ingored argument
          */
@@ -28 +28 @@
         /**
          * connect filesystem.
-         * 
+         *
          * @return bool Returns true on success or false on failure (always true for WP_Filesystem_Direct).
          */
@@ -36 +36 @@
         /**
          * Reads entire file into a string
-         * 
+         *
          * @param $file string Name of the file to read.
-         * @return string|bool The function returns the read data or false on failure. 
+         * @return string|bool The function returns the read data or false on failure.
          */
         function get_contents($file) {
@@ -45 +45 @@
         /**
          * Reads entire file into an array
-         * 
-         * @param $file string Path to the file. 
-         * @return array|bool the file contents in an array or false on failure. 
+         *
+         * @param $file string Path to the file.
+         * @return array|bool the file contents in an array or false on failure.
          */
         function get_contents_array($file) {
@@ -54 +54 @@
         /**
          * Write a string to a file
-         * 
-         * @param $file string Path to the file where to write the data. 
+         *
+         * @param $file string Path to the file where to write the data.
          * @param $contents string The data to write.
          * @param $mode int (optional) The file permissions as octal number, usually 0644.
@@ -71 +71 @@
         /**
          * Gets the current working directory
-         * 
-         * @return string|bool the current working directory on success, or false on failure. 
+         *
+         * @return string|bool the current working directory on success, or false on failure.
          */
         function cwd() {
@@ -80 +80 @@
          * Change directory
          *
-         * @param $dir string The new current directory. 
+         * @param $dir string The new current directory.
          * @return bool Returns true on success or false on failure.
          */
@@ -88 +88 @@
         /**
          * Changes file group
-         * 
-         * @param $file string Path to the file. 
+         *
+         * @param $file string Path to the file.
          * @param $group mixed A group name or number.
-         * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False. 
+         * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
          * @return bool Returns true on success or false on failure.
          */
@@ -111 +111 @@
         /**
          * Changes filesystem permissions
-         * 
+         *
          * @param $file string Path to the file.
          * @param $mode int (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
-         * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False. 
+         * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
          * @return bool Returns true on success or false on failure.
          */
@@ -127 +127 @@
                                 $mode = FS_CHMOD_DIR;
                         else
-                                return false;   
+                                return false;
                 }
 
@@ -144 +144 @@
         /**
          * Changes file owner
-         * 
-         * @param $file string Path to the file. 
+         *
+         * @param $file string Path to the file.
          * @param $owner mixed A user name or number.
-         * @param $recursive bool (optional) If set True changes file owner recursivly. Defaults to False. 
+         * @param $recursive bool (optional) If set True changes file owner recursivly. Defaults to False.
          * @return bool Returns true on success or false on failure.
          */
@@ -166 +166 @@
         /**
          * Gets file owner
-         * 
-         * @param $file string Path to the file. 
+         *
+         * @param $file string Path to the file.
          * @return string Username of the user.
          */
@@ -181 +181 @@
         /**
          * Gets file permissions
-         * 
+         *
          * FIXME does not handle errors in fileperms()
-         * 
-         * @param $file string Path to the file. 
+         *
+         * @param $file string Path to the file.
          * @return string Mode of the file (last 4 digits).
          */

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

@@ -150 +150 @@
                                 $mode = FS_CHMOD_DIR;
                         else
-                                return false;   
+                                return false;
                 }
 

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

@@ -161 +161 @@
                                 $mode = FS_CHMOD_DIR;
                         else
-                                return false;   
+                                return false;
                 }
 

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

@@ -195 +195 @@
                                 $mode = FS_CHMOD_DIR;
                         else
-                                return false;   
+                                return false;
                 }
 

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

@@ -571 +571 @@
                         return false;
                 }
-                
+
                 $r = $current->response[ $theme ];
 
@@ -1007 +1007 @@
                         $stylesheet = $this->upgrader->result['destination_name'];
                         $template = !empty($theme_info['Template']) ? $theme_info['Template'] : $stylesheet;
-        
+
                         $preview_link = htmlspecialchars( add_query_arg( array('preview' => 1, 'template' => $template, 'stylesheet' => $stylesheet, 'TB_iframe' => 'true' ), trailingslashit(esc_url(get_option('home'))) ) );
                         $activate_link = wp_nonce_url("themes.php?action=activate&template=" . urlencode($template) . "&stylesheet=" . urlencode($stylesheet), 'switch-theme_' . $template);
-        
+
                         $update_actions =  array(
                                 'preview' => '<a href="' . $preview_link . '" class="thickbox thickbox-preview" title="' . esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $name)) . '">' . __('Preview') . '</a>',

trunk/wp-admin/includes/export.php

@@ -269 +269 @@
                         if ( 'revision' == $post->post_type )
                                 continue;
-                        setup_postdata($post); 
+                        setup_postdata($post);
 
                         $is_sticky = 0;

trunk/wp-admin/includes/file.php

@@ -599 +599 @@
                 if( ! file_exists($abstraction_file) )
                         return;
-        
+
                 require_once($abstraction_file);
         }

trunk/wp-admin/includes/image-edit.php

@@ -43 +43 @@
                 <div onclick="imageEdit.flip(1, <?php echo "$post_id, '$nonce'"; ?>)" class="imgedit-fliph" title="<?php echo esc_attr__( 'Flip horizontally' ); ?>"></div>
                 <div onclick="imageEdit.flip(2, <?php echo "$post_id, '$nonce'"; ?>)" class="imgedit-flipv" title="<?php echo esc_attr__( 'Flip vertically' ); ?>"></div>
-                
+
                 <div id="image-undo-<?php echo $post_id; ?>" onclick="imageEdit.undo(<?php echo "$post_id, '$nonce'"; ?>)" class="imgedit-undo disabled" title="<?php echo esc_attr__( 'Undo' ); ?>"></div>
                 <div id="image-redo-<?php echo $post_id; ?>" onclick="imageEdit.redo(<?php echo "$post_id, '$nonce'"; ?>)" class="imgedit-redo disabled" title="<?php echo esc_attr__( 'Redo' ); ?>"></div>

trunk/wp-admin/includes/plugin.php

@@ -616 +616 @@
                 $menu[$position] = $new_menu;
         }
-        
+
         $_registered_pages[$hookname] = true;
 
@@ -624 +624 @@
 function add_object_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
         global $_wp_last_object_menu;
-        
+
         $_wp_last_object_menu++;
-        
+
         return add_menu_page($page_title, $menu_title, $access_level, $file, $function, $icon_url, $_wp_last_object_menu);
 }
@@ -632 +632 @@
 function add_utility_page( $page_title, $menu_title, $access_level, $file, $function = '', $icon_url = '') {
         global $_wp_last_utility_menu;
-        
+
         $_wp_last_utility_menu++;
-        
+
         return add_menu_page($page_title, $menu_title, $access_level, $file, $function, $icon_url, $_wp_last_utility_menu);
 }
@@ -675 +675 @@
         $_registered_pages[$hookname] = true;
         // backwards-compatibility for plugins using add_management page.  See wp-admin/admin.php for redirect from edit.php to tools.php
-        if ( 'tools.php' == $parent ) 
+        if ( 'tools.php' == $parent )
                 $_registered_pages[get_plugin_page_hookname( $file, 'edit.php')] = true;
 

trunk/wp-admin/includes/post.php

@@ -1079 +1079 @@
 /**
  * Outputs the notice message to say that someone else is editing this post at the moment.
- * 
+ *
  * @since 2.9.0
  * @return none
@@ -1087 +1087 @@
         $last_user = get_userdata( get_post_meta( $post->ID, '_edit_last', true ) );
         $last_user_name = $last_user ? $last_user->display_name : __('Somebody');
-        
+
         switch ($post->post_type) {
                 case 'post':
@@ -1098 +1098 @@
                         $message = __( 'Warning: %s is currently editing this.' );
         }
-        
+
         $message = sprintf( $message, esc_html( $last_user_name ) );
-        echo "<div class='error'><p>$message</p></div>";        
+        echo "<div class='error'><p>$message</p></div>";
 }
 

trunk/wp-admin/includes/template.php

@@ -2066 +2066 @@
                 $query .= "AND $approved $post $typesql";
         }
-        
+
         $comments = $wpdb->get_results("SELECT * $query $orderby");
         if ( '' === $total )

trunk/wp-admin/install.php

@@ -55 +55 @@
                 $blog_public = isset($_POST['blog_public']);
         }
-        
+
         if ( ! is_null( $error ) ) {
 ?>

trunk/wp-admin/media.php

@@ -61 +61 @@
         if ( empty($att->ID) ) wp_die( __('You attempted to edit an attachment that doesn’t exist. Perhaps it was deleted?') );
         if ( $att->post_status == 'trash' ) wp_die( __('You can’t edit this attachment because it is in the Trash. Please move it out of the Trash and try again.') );
-        
+
         add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
 

trunk/wp-admin/menu-header.php

@@ -132 +132 @@
                                 if ( ( ('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR . "/$sub_file") ) || ! empty($menu_hook) ) {
                                         // If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-                                        
+
                                         $parent_exists = (!$admin_is_parent && file_exists(WP_PLUGIN_DIR . "/$menu_file") && !is_dir(WP_PLUGIN_DIR . "/{$item[2]}") ) || file_exists($menu_file);
                                         if ( $parent_exists )

trunk/wp-admin/plugins.php

@@ -62 +62 @@
                         if ( ! current_user_can('activate_plugins') )
                                 wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
-                        
+
                         check_admin_referer('bulk-manage-plugins');
 

trunk/wp-admin/upgrade.php

@@ -69 +69 @@
         case 1:
                 wp_upgrade();
-                        
+
                         $backto = empty($_GET['backto']) ? '' : $_GET['backto'] ;
                         $backto = stripslashes( urldecode( $backto ) );

trunk/wp-admin/upload.php

@@ -70 +70 @@
 } elseif ( isset($_GET['doaction']) || isset($_GET['doaction2']) || isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
         check_admin_referer('bulk-media');
-        
+
         if ( isset($_GET['delete_all']) || isset($_GET['delete_all2']) ) {
                 $post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
@@ -79 +79 @@
         } else
                 wp_redirect($_SERVER['HTTP_REFERER']);
-        
+
         $location = 'upload.php';
         if ( $referer = wp_get_referer() ) {
@@ -91 +91 @@
                                 if ( !current_user_can('delete_post', $post_id) )
                                         wp_die( __('You are not allowed to move this post to the trash.') );
-                                
+
                                 if ( !wp_trash_post($post_id) )
                                         wp_die( __('Error in moving to trash...') );
@@ -101 +101 @@
                                 if ( !current_user_can('delete_post', $post_id) )
                                         wp_die( __('You are not allowed to move this post out of the trash.') );
-                                
+
                                 if ( !wp_untrash_post($post_id) )
                                         wp_die( __('Error in restoring from trash...') );
@@ -111 +111 @@
                                 if ( !current_user_can('delete_post', $post_id_del) )
                                         wp_die( __('You are not allowed to delete this post.') );
-        
+
                                 if ( !wp_delete_attachment($post_id_del) )
                                         wp_die( __('Error in deleting...') );

trunk/wp-admin/user-edit.php

@@ -274 +274 @@
         <th><label for="<?php echo $name; ?>"><?php echo apply_filters('user_'.$name.'_label', $desc); ?></label></th>
         <td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
-</tr>   
+</tr>
 <?php
         }

trunk/wp-app.php

@@ -782 +782 @@
 
                 $location = get_post_meta($entry['ID'], '_wp_attached_file', true);
-                $location = get_option ('upload_path') . '/' . $location; 
+                $location = get_option ('upload_path') . '/' . $location;
                 $filetype = wp_check_filetype($location);
 
@@ -792 +792 @@
                 header('Connection: close');
 
-                if ($fp = fopen($location, "rb")) { 
-                        status_header('200'); 
-                        header('Content-Type: ' . $entry['post_mime_type']); 
+                if ($fp = fopen($location, "rb")) {
+                        status_header('200');
+                        header('Content-Type: ' . $entry['post_mime_type']);
                         header('Connection: close');
 

trunk/wp-includes/canonical.php

@@ -96 +96 @@
                         }
                 } elseif ( is_single() && !empty($_GET['name'])  && ! $redirect_url ) {
-                        if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) ) 
-                                $redirect['query'] = remove_query_arg('name', $redirect['query']); 
+                        if ( $redirect_url = get_permalink( $wp_query->get_queried_object_id() ) )
+                                $redirect['query'] = remove_query_arg('name', $redirect['query']);
                 } elseif ( is_page() && !empty($_GET['page_id']) && ! $redirect_url ) {
                         if ( $redirect_url = get_permalink(get_query_var('page_id')) )

trunk/wp-includes/class-json.php

@@ -267 +267 @@
         function _encode($var)
         {
-                
+
                 switch (gettype($var)) {
                         case 'boolean':

trunk/wp-includes/classes.php

@@ -215 +215 @@
                                         // Trim the query of everything up to the '?'.
                                         $query = preg_replace("!^.+\?!", '', $query);
-                                                                                
+
                                         // Substitute the substring matches into the query.
                                         $query = addslashes(WP_MatchesMapRegex::apply($query, $matches));
@@ -1595 +1595 @@
 /**
  * Helper class to remove the need to use eval to replace $matches[] in query strings.
- * 
+ *
  * @since 2.9.0
  */
@@ -1601 +1601 @@
         /**
          * store for matches
-         * 
+         *
          * @access private
          * @var array
          */
         var $_matches;
-        
+
         /**
          * store for mapping result
-         * 
+         *
          * @access public
          * @var string
          */
         var $output;
-        
+
         /**
          * subject to perform mapping on (query string containing $matches[] references
-         * 
+         *
          * @access private
          * @var string
          */
         var $_subject;
-        
-        /**
-         * regexp pattern to match $matches[] references 
-         * 
+
+        /**
+         * regexp pattern to match $matches[] references
+         *
          * @var string
          */
         var $_pattern = '(\$matches\[[1-9]+[0-9]*\])'; // magic number
-        
+
         /**
          * constructor
-         * 
+         *
          * @param string $subject subject if regex
          * @param array  $matches data to use in map
          * @return self
-         */                                             
+         */
         function WP_MatchesMapRegex($subject, $matches) {
                 $this->_subject = $subject;
                 $this->_matches = $matches;
-                $this->output = $this->_map();                          
-        }
-        
+                $this->output = $this->_map();
+        }
+
         /**
          * Substitute substring matches in subject.
-         * 
+         *
          * static helper function to ease use
-         * 
+         *
          * @access public
          * @param string $subject subject
@@ -1655 +1655 @@
         function apply($subject, $matches) {
                 $oSelf =& new WP_MatchesMapRegex($subject, $matches);
-                return $oSelf->output;                                                                                                                          
-        }
-        
-        /**
-         * do the actual mapping 
-         * 
+                return $oSelf->output;
+        }
+
+        /**
+         * do the actual mapping
+         *
          * @access private
          * @return string
@@ -1668 +1668 @@
                 return preg_replace_callback($this->_pattern, $callback, $this->_subject);
         }
-        
+
         /**
          * preg_replace_callback hook
-         * 
+         *
          * @access public
          * @param  array $matches preg_replace regexp matches
@@ -1680 +1680 @@
                 return ( isset( $this->_matches[$index] ) ? $this->_matches[$index] : '' );
         }
-        
+
 }
 

trunk/wp-includes/comment-template.php

@@ -836 +836 @@
         /**
          * The email address of the current comment author escaped for use in attributes.
-         */     
+         */
         $comment_author_email = $commenter['comment_author_email'];  // Escaped by sanitize_comment_cookies()
 
         /**
          * The url of the current comment author escaped for use in attributes.
-         */     
+         */
         $comment_author_url = esc_url($commenter['comment_author_url']);
 

trunk/wp-includes/comment.php

@@ -735 +735 @@
         if (wp_get_comment_status($comment_id) != 'trash' && wp_get_comment_status($comment_id) != 'spam' && EMPTY_TRASH_DAYS > 0)
                 return wp_trash_comment($comment_id);
-        
+
         do_action('delete_comment', $comment_id);
-        
+
         $trash_meta = get_option('wp_trash_meta');
         if (is_array($trash_meta) && isset($trash_meta['comments'][$comment_id])) {
@@ -1094 +1094 @@
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
         global $wpdb;
-                
+
         $status = '0';
         switch ( $comment_status ) {

trunk/wp-includes/formatting.php

@@ -33 +33 @@
         $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
         $stop = count($textarr);
-        
+
         /* translators: opening curly quote */
         $opening_quote = _x('&#8220;', 'opening curly quote');
         /* translators: closing curly quote */
         $closing_quote = _x('&#8221;', 'closing curly quote');
-        
+
         $no_texturize_tags = apply_filters('no_texturize_tags', array('pre', 'code', 'kbd', 'style', 'script', 'tt'));
         $no_texturize_shortcodes = apply_filters('no_texturize_shortcodes', array('code'));
@@ -1327 +1327 @@
         $img = $wpsmiliestrans[$smiley];
         $smiley_masked = esc_attr($smiley);
-        
+
         $srcurl = apply_filters('smilies_src', "$siteurl/wp-includes/images/smilies/$img", $img, $siteurl);
 
@@ -2088 +2088 @@
 /**
  * Perform a deep string replace operation to ensure the values in $search are no longer present
- * 
+ *
  * Repeats the replacement operation until it no longer replaces anything so as to remove "nested" values
  * e.g. $subject = '%0%0%0DDD', $search ='%0D', $result ='' rather than the '%0%0DD' that
  * str_replace would return
- * 
+ *
  * @since 2.8.1
  * @access private
- * 
+ *
  * @param string|array $search
  * @param string $subject
@@ -2111 +2111 @@
                 }
         }
-        
+
         return $subject;
 }

trunk/wp-includes/functions.php

@@ -3309 +3309 @@
                 } else {
                         // It's inside a continent group
-                        
+
                         // Continent optgroup
                         if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) {
@@ -3315 +3315 @@
                                 $structure[] = '<optgroup label="'. esc_attr( $label ) .'">';
                         }
-                        
+
                         // Add the city to the value
                         $value[] = $zone['city'];
@@ -3343 +3343 @@
                 }
                 $structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
-                
+
                 // Close continent optgroup
                 if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) {
@@ -3365 +3365 @@
 /**
  * Permanently deletes posts, pages, attachments, and comments which have been in the trash for EMPTY_TRASH_DAYS.
- * 
+ *
  * @since 2.9.0
  *
@@ -3374 +3374 @@
 
         $delete_timestamp = time() - (60*60*24*EMPTY_TRASH_DAYS);
-        
+
         $posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
-        
+
         foreach ( (array) $posts_to_delete as $post ) {
                 wp_delete_post($post['post_id']);
@@ -3382 +3382 @@
 
         //Trashed Comments
-        //TODO Come up with a better store for the comment trash meta. 
+        //TODO Come up with a better store for the comment trash meta.
         $trash_meta = get_option('wp_trash_meta');
         if ( !is_array($trash_meta) )

trunk/wp-includes/http.php

@@ -1814 +1814 @@
          * Decompression of deflated string while staying compatible with the majority of servers.
          *
-         * Certain Servers will return deflated data with headers which PHP's gziniflate() 
+         * Certain Servers will return deflated data with headers which PHP's gziniflate()
          * function cannot handle out of the box. The following function lifted from
-         * http://au2.php.net/manual/en/function.gzinflate.php#77336 will attempt to deflate 
-         * the various return forms used. 
+         * http://au2.php.net/manual/en/function.gzinflate.php#77336 will attempt to deflate
+         * the various return forms used.
          *
          * @since 2.8.1

trunk/wp-includes/kses.php

@@ -1177 +1177 @@
 
         $css_array = split( ';', trim( $css ) );
-        $allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float', 
-        'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color', 
+        $allowed_attr = apply_filters( 'safe_style_css', array( 'text-align', 'margin', 'color', 'float',
+        'border', 'background', 'background-color', 'border-bottom', 'border-bottom-color',
         'border-bottom-style', 'border-bottom-width', 'border-collapse', 'border-color', 'border-left',
-        'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color', 
-        'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top', 
-        'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side', 
-        'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style', 
-        'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom', 
-        'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom', 
-        'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align', 
+        'border-left-color', 'border-left-style', 'border-left-width', 'border-right', 'border-right-color',
+        'border-right-style', 'border-right-width', 'border-spacing', 'border-style', 'border-top',
+        'border-top-color', 'border-top-style', 'border-top-width', 'border-width', 'caption-side',
+        'clear', 'cursor', 'direction', 'font', 'font-family', 'font-size', 'font-style',
+        'font-variant', 'font-weight', 'height', 'letter-spacing', 'line-height', 'margin-bottom',
+        'margin-left', 'margin-right', 'margin-top', 'overflow', 'padding', 'padding-bottom',
+        'padding-left', 'padding-right', 'padding-top', 'text-decoration', 'text-indent', 'vertical-align',
         'width' ) );
 

trunk/wp-includes/link-template.php

@@ -1649 +1649 @@
 function get_shortcut_link() {
         $link = "javascript:
-                        var d=document, 
-                        w=window, 
-                        e=w.getSelection, 
-                        k=d.getSelection, 
+                        var d=document,
+                        w=window,
+                        e=w.getSelection,
+                        k=d.getSelection,
                         x=d.selection,
                         s=(e?e():(k)?k():(x?x.createRange().text:0)),

trunk/wp-includes/media.php

@@ -350 +350 @@
 
         imagecopyresampled( $newimage, $image, $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h);
-        
+
         // convert from full colors to index colors, like original PNG.
         if ( IMAGETYPE_PNG == $orig_type && !imageistruecolor( $image ) )
@@ -379 +379 @@
                 // all other formats are converted to jpg
                 $destfilename = "{$dir}/{$name}-{$suffix}.jpg";
-                if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) ) 
+                if ( !imagejpeg( $newimage, $destfilename, apply_filters( 'jpeg_quality', $jpeg_quality, 'image_resize' ) ) )
                         return new WP_Error('resize_path_invalid', __( 'Resize path invalid' ));
         }
@@ -838 +838 @@
                         case 'image/gif':
                                 return function_exists('imagecreatefromgif');
-                }               
+                }
         }
         return false;

trunk/wp-includes/pluggable.php

@@ -999 +999 @@
                 $notify_message .= __('Excerpt: ') . "\r\n" . $comment->comment_content . "\r\n\r\n";
                 $notify_message .= __('You can see all trackbacks on this post here: ') . "\r\n";
-                /* translators: 1: blog name, 2: post title */          
+                /* translators: 1: blog name, 2: post title */
                 $subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
         } elseif ('pingback' == $comment_type) {

trunk/wp-includes/post.php

@@ -136 +136 @@
 
         $children = get_posts( $r );
-        
+
         if ( !$children )
                 return $kids;
@@ -584 +584 @@
 
         wp_cache_delete($post_id, 'post_meta');
-        
+
         do_action( 'deleted_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
 
@@ -673 +673 @@
 
         do_action( 'update_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
-        
+
         $wpdb->update( $wpdb->postmeta, $data, $where );
         wp_cache_delete($post_id, 'post_meta');
-        
+
         do_action( 'updated_post_meta', $meta_id, $post_id, $meta_key, $meta_value );
-        
+
         return true;
 }
@@ -1155 +1155 @@
         if ( ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS > 0 )
                 return wp_trash_post($postid);
-                
+
         if ( $post->post_type == 'attachment' )
                 return wp_delete_attachment($postid);
 
         do_action('delete_post', $postid);
-        
+
         delete_post_meta($postid,'_wp_trash_meta_status');
         delete_post_meta($postid,'_wp_trash_meta_time');
@@ -1820 +1820 @@
         if ( in_array( $post_status, array( 'draft', 'pending' ) ) )
                 return $slug;
-        
+
         global $wpdb, $wp_rewrite;
         $hierarchical_post_types = apply_filters('hierarchical_post_types', array('page'));
@@ -1827 +1827 @@
                 $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
                 $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
-                
+
                 if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
                         $suffix = 2;
@@ -1842 +1842 @@
                 $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( '" . implode("', '", $wpdb->escape($hierarchical_post_types)) . "' ) AND ID != %d AND post_parent = %d LIMIT 1";
                 $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID, $post_parent));
-                
+
                 if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
                         $suffix = 2;
@@ -1856 +1856 @@
                 $check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
                 $post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID));
-                
+
                 if ( $post_name_check || in_array($slug, $wp_rewrite->feeds) ) {
                         $suffix = 2;

trunk/wp-includes/query.php

@@ -2698 +2698 @@
 
         do_action_ref_array('the_post', array(&$post));
-        
+
         return true;
 }

trunk/wp-includes/registration.php

@@ -307 +307 @@
  *
  * @access private
- * @since 
+ * @since
  *
  * @return array $user_contactmethods Array of contact methods and their labels.

trunk/wp-includes/script-loader.php

@@ -453 +453 @@
         // Register "meta" stylesheet for admin colors. All colors-* style sheets should have the same version string.
         $styles->add( 'colors', true, array(), $colors_version );
-        
+
         // do not refer to these directly, the right one is queued by the above "meta" colors handle
         $styles->add( 'colors-fresh', "/wp-admin/css/colors-fresh$suffix.css", array(), $colors_version);

trunk/wp-includes/theme.php

@@ -605 +605 @@
 
         $templates = array();
-        
+
         if ( !is_wp_error($category) )
                 $templates[] = "category-{$category->slug}.php";
 
         $templates[] = "category-$cat_ID.php";
-        $templates[] = "category.php";  
-        
+        $templates[] = "category.php";
+
         $template = locate_template($templates);
         return apply_filters('category_template', $template);

trunk/wp-includes/user.php

@@ -421 +421 @@
         wp_cache_delete($user_id, 'users');
 
-        if ( !$cur ) 
+        if ( !$cur )
                 do_action( 'added_usermeta', $wpdb->insert_id, $user_id, $meta_key, $meta_value );
         else

trunk/wp-includes/wp-db.php

@@ -264 +264 @@
         var $old_tables = array('categories', 'post2cat', 'link2cat');
 
-        
+
         /**
          * Format specifiers for DB columns. Columns not listed here default to %s.  Initialized in wp-settings.php.

trunk/wp-login.php

@@ -60 +60 @@
         if ( $is_iphone ) {
         ?>
-        <meta name="viewport" content="width=320; initial-scale=0.9; maximum-scale=1.0; user-scalable=0;" /> 
-        <style type="text/css" media="screen"> 
+        <meta name="viewport" content="width=320; initial-scale=0.9; maximum-scale=1.0; user-scalable=0;" />
+        <style type="text/css" media="screen">
         form { margin-left: 0px; }
         #login { margin-top: 20px; }