Ticket #38464: 38464.patch

src/wp-admin/css/common.css

@@ -2899 +2899 @@
         #section-holder {
                 position: static;
                 margin: 0;
-                padding-bottom: 70px; /* reset from the two column height fix, plus accomodate footer */
+                padding-bottom: 70px; /* reset from the two column height fix, plus accommodate footer */
         }
 
         #plugin-information .fyi h3,

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

@@ -34 +34 @@
   // In version 1.x of PclZip, the separator for file list is a space
   // (which is not a very smart choice, specifically for windows paths !).
   // A better separator should be a comma (,). This constant gives you the
-  // abilty to change that.
+  // ability to change that.
   // However notice that changing this value, may have impact on existing
   // scripts, using space separated filenames.
-  // Recommanded values for compatibility with older versions :
+  // Recommended values for compatibility with older versions :
   //define( 'PCLZIP_SEPARATOR', ' ' );
-  // Recommanded values for smart separation of filenames.
+  // Recommended values for smart separation of filenames.
   if (!defined('PCLZIP_SEPARATOR')) {
     define( 'PCLZIP_SEPARATOR', ',' );
   }
@@ -248 +248 @@
   //   When a directory is in the list, the directory and its content is added
   //   in the archive.
   //   In this synopsis, the function takes an optional variable list of
-  //   options. See bellow the supported options.
+  //   options. See below the supported options.
   // Parameters :
   //   $p_filelist : An array containing file or directory names, or
   //                 a string containing one filename or one directory name, or
@@ -1064 +1064 @@
   // Function : deleteByIndex()
   // Description :
   //   ***** Deprecated *****
-  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be prefered.
+  //   delete(PCLZIP_OPT_BY_INDEX, $p_index) should be preferred.
   // --------------------------------------------------------------------------------
   function deleteByIndex($p_index)
   {
@@ -1126 +1126 @@
         return 0;
       }
 
-      // ----- Read the central directory informations
+      // ----- Read the central directory information
       $v_central_dir = array();
       if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
       {
@@ -1698 +1698 @@
               if ($v_result_list[$p_options_list[$i]][$j]['start'] < $v_sort_value) {
                   $v_sort_flag=true;
 
-                  // ----- TBC : An automatic sort should be writen ...
+                  // ----- TBC : An automatic sort should be written ...
                   // ----- Error log
                   PclZip::privErrorLog(PCLZIP_ERR_INVALID_OPTION_VALUE, "Invalid order of index range for option '".PclZipUtilOptionText($p_options_list[$i])."'");
 
@@ -2189 +2189 @@
       return $v_result;
     }
 
-    // ----- Read the central directory informations
+    // ----- Read the central directory information
     $v_central_dir = array();
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
     {
@@ -2391 +2391 @@
   // Function : privAddList()
   // Description :
   //   $p_add_dir and $p_remove_dir will give the ability to memorize a path which is
-  //   different from the real path of the file. This is usefull if you want to have PclTar
+  //   different from the real path of the file. This is useful if you want to have PclTar
   //   running in any directory, and memorize relative path from an other directory.
   // Parameters :
   //   $p_list : An array containing the file or directory names to add in the tar
@@ -2631 +2631 @@
         $v_result = 1;
       }
 
-      // ----- Update the informations
+      // ----- Update the information
       // Only some fields can be modified
       if ($p_header['stored_filename'] != $v_local_header['stored_filename']) {
         $p_header['stored_filename'] = PclZipUtilPathReduction($v_local_header['stored_filename']);
@@ -2783 +2783 @@
         $v_result = 1;
       }
 
-      // ----- Update the informations
+      // ----- Update the information
       // Nothing can be modified
     }
 
@@ -3169 +3169 @@
       return PclZip::errorCode();
     }
 
-    // ----- Read the central directory informations
+    // ----- Read the central directory information
     $v_central_dir = array();
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
     {
@@ -3220 +3220 @@
   // --------------------------------------------------------------------------------
   // Function : privConvertHeader2FileInfo()
   // Description :
-  //   This function takes the file informations from the central directory
+  //   This function takes the file information from the central directory
   //   entries and extract the interesting parameters that will be given back.
   //   The resulting file infos are set in the array $p_info
   //     $p_info['filename'] : Filename with full path. Given by user (add),
@@ -3313 +3313 @@
       return $v_result;
     }
 
-    // ----- Read the central directory informations
+    // ----- Read the central directory information
     $v_central_dir = array();
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
     {
@@ -3713 +3713 @@
         $v_result = PCLZIP_ERR_USER_ABORTED;
       }
 
-      // ----- Update the informations
+      // ----- Update the information
       // Only some fields can be modified
       $p_entry['filename'] = $v_local_header['filename'];
     }
@@ -4080 +4080 @@
         $v_result = PCLZIP_ERR_USER_ABORTED;
       }
 
-      // ----- Update the informations
+      // ----- Update the information
       // Only some fields can be modified
       $p_entry['filename'] = $v_local_header['filename'];
     }
@@ -4193 +4193 @@
         $v_result = PCLZIP_ERR_USER_ABORTED;
       }
 
-      // ----- Update the informations
+      // ----- Update the information
       // Only some fields can be modified
       $p_entry['filename'] = $v_local_header['filename'];
     }
@@ -4689 +4689 @@
       return $v_result;
     }
 
-    // ----- Read the central directory informations
+    // ----- Read the central directory information
     $v_central_dir = array();
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
     {
@@ -5075 +5075 @@
       return $v_result;
     }
 
-    // ----- Read the central directory informations
+    // ----- Read the central directory information
     $v_central_dir = array();
     if (($v_result = $this->privReadEndCentralDir($v_central_dir)) != 1)
     {
@@ -5095 +5095 @@
       return $v_result;
     }
 
-    // ----- Read the central directory informations
+    // ----- Read the central directory information
     $v_central_dir_to_add = array();
     if (($v_result = $p_archive_to_add->privReadEndCentralDir($v_central_dir_to_add)) != 1)
     {

src/wp-admin/includes/export.php

@@ -353 +353 @@
         }
 
         /**
-         * Ouput all navigation menu terms
+         * Output all navigation menu terms
          *
          * @since 3.1.0
          */

src/wp-admin/includes/misc.php

@@ -133 +133 @@
                 $lines[] = rtrim( fgets( $fp ), "\r\n" );
         }
 
-        // Split out the existing file into the preceeding lines, and those that appear after the marker
+        // Split out the existing file into the preceding lines, and those that appear after the marker
         $pre_lines = $post_lines = $existing_lines = array();
         $found_marker = $found_end_marker = false;
         foreach ( $lines as $line ) {

src/wp-admin/includes/upgrade.php

@@ -2821 +2821 @@
         // Multisite schema upgrades.
         if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) {
 
-                // Upgrade verions prior to 3.7
+                // Upgrade versions prior to 3.7
                 if ( $wp_current_db_version < 25179 ) {
                         // New primary key for signups.
                         $wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );

src/wp-admin/js/editor-expand.js

@@ -318 +318 @@
                                 topHeight = heights.textTopHeight;
                         }
 
-                        // TinyMCE still intializing.
+                        // TinyMCE still initializing.
                         if ( ! visual && ! $top.length ) {
                                 return;
                         }

src/wp-admin/js/post.js

@@ -140 +140 @@
                         /**
                          * Handle server response
                          *
-                         * @param {string} str Response, will be '0' when an error occured otherwise contains link to add Featured Image.
+                         * @param {string} str Response, will be '0' when an error occurred otherwise contains link to add Featured Image.
                          */
                         function(str){
                         if ( str == '0' ) {