Changeset 29206 for trunk/src/wp-admin/includes/upgrade.php

Timestamp:

07/17/2014 09:13:53 AM (11 years ago)

Author:

DrewAPicture

Message:

Fix syntax for single- and multi-line comments in wp-admin-directory files.

See #28931.

File:

• trunk/src/wp-admin/includes/upgrade.php (modified) (23 diffs)

trunk/src/wp-admin/includes/upgrade.php

@@ -62 +62 @@
         update_option('default_pingback_flag', 0);
 
-    // Create default user. If the user already exists, the user tables are
-    // being shared among blogs. Just set the role in that case.
+    /*
+     * Create default user. If the user already exists, the user tables are
+     * being shared among blogs. Just set the role in that case.
+     */
     $user_id = username_exists($user_name);
     $user_password = trim($user_password);
@@ -626 +628 @@
     $active_plugins = __get_option('active_plugins');
 
-    // If plugins are not stored in an array, they're stored in the old
-    // newline separated format. Convert to new format.
+    /*
+     * If plugins are not stored in an array, they're stored in the old
+     * newline separated format. Convert to new format.
+     */
     if ( !is_array( $active_plugins ) ) {
         $active_plugins = explode("\n", trim($active_plugins));
@@ -717 +721 @@
     $wpdb->show_errors();
 
-    // populate comment_count field of posts table
+    // Populate comment_count field of posts table.
     $comments = $wpdb->get_results( "SELECT comment_post_ID, COUNT(*) as c FROM $wpdb->comments WHERE comment_approved = '1' GROUP BY comment_post_ID" );
     if ( is_array( $comments ) )
@@ -723 +727 @@
             $wpdb->update( $wpdb->posts, array('comment_count' => $comment->c), array('ID' => $comment->comment_post_ID) );
 
-    // Some alpha versions used a post status of object instead of attachment and put
-    // the mime type in post_type instead of post_mime_type.
+    /*
+     * Some alpha versions used a post status of object instead of attachment
+     * and put the mime type in post_type instead of post_mime_type.
+     */
     if ( $wp_current_db_version > 2541 && $wp_current_db_version <= 3091 ) {
         $objects = $wpdb->get_results("SELECT ID, post_type FROM $wpdb->posts WHERE post_status = 'object'");
@@ -881 +887 @@
     // < 3570 we used linkcategories. >= 3570 we used categories and link2cat.
     if ( $wp_current_db_version < 3570 ) {
-        // Create link_category terms for link categories. Create a map of link cat IDs
-        // to link_category terms.
+        /*
+         * Create link_category terms for link categories. Create a map of link
+         * cat IDs to link_category terms.
+         */
         $link_cat_id_map = array();
         $default_link_cat = 0;
@@ -990 +998 @@
  */
 function upgrade_old_slugs() {
-    // upgrade people who were using the Redirect Old Slugs plugin
+    // Upgrade people who were using the Redirect Old Slugs plugin.
     global $wpdb;
     $wpdb->query("UPDATE $wpdb->postmeta SET meta_key = '_wp_old_slug' WHERE meta_key = 'old_slug'");
@@ -1305 +1313 @@
     global $wp_current_db_version, $wpdb;
 
-    // Always
+    // Always.
     if ( is_main_network() ) {
-        // Deletes all expired transients.
-        // The multi-table delete syntax is used to delete the transient record from table a,
-        // and the corresponding transient_timeout record from table b.
+        /*
+         * Deletes all expired transients. The multi-table delete syntax is used
+         * to delete the transient record from table a, and the corresponding
+         * transient_timeout record from table b.
+         */
         $time = time();
         $sql = "DELETE a, b FROM $wpdb->sitemeta a, $wpdb->sitemeta b
@@ -1319 +1329 @@
     }
 
-    // 2.8
+    // 2.8.
     if ( $wp_current_db_version < 11549 ) {
         $wpmu_sitewide_plugins = get_site_option( 'wpmu_sitewide_plugins' );
@@ -1416 +1426 @@
         return true;
     }
-    //didn't find it try to create it.
+
+    // Didn't find it try to create it..
     $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
+
+    // We cannot directly tell that whether this succeeded!
     if ( $wpdb->get_var( $query ) == $table_name ) {
         return true;
@@ -1479 +1491 @@
         }
     }
-    //didn't find it try to create it.
+
+    // Didn't find it try to create it.
     $wpdb->query($create_ddl);
-    // we cannot directly tell that whether this succeeded!
+
+    // We cannot directly tell that whether this succeeded!
     foreach ($wpdb->get_col("DESC $table_name", 0) as $column ) {
         if ($column == $column_name) {
@@ -1552 +1566 @@
     // Note: \\\ inside a regex denotes a single backslash.
 
-    // Replace one or more backslashes followed by a single quote with
-    // a single quote.
+    /*
+     * Replace one or more backslashes followed by a single quote with
+     * a single quote.
+     */
     $content = preg_replace("/\\\+'/", "'", $content);
 
-    // Replace one or more backslashes followed by a double quote with
-    // a double quote.
+    /*
+     * Replace one or more backslashes followed by a double quote with
+     * a double quote.
+     */
     $content = preg_replace('/\\\+"/', '"', $content);
 
@@ -1656 +1674 @@
             continue;
 
-        // Clear the field and index arrays
+        // Clear the field and index arrays.
         $cfields = $indices = array();
-        // Get all of the field names in the query from between the parens
+
+        // Get all of the field names in the query from between the parentheses.
         preg_match("|\((.*)\)|ms", $qry, $match2);
         $qryline = trim($match2[1]);
 
-        // Separate field lines into an array
+        // Separate field lines into an array.
         $flds = explode("\n", $qryline);
 
+        // todo: Remove this?
         //echo "<hr/><pre>\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."</pre><hr/>";
 
-        // For every field line specified in the query
+        // For every field line specified in the query.
         foreach ($flds as $fld) {
-            // Extract the field name
+
+            // Extract the field name.
             preg_match("|^([^ ]*)|", trim($fld), $fvals);
             $fieldname = trim( $fvals[1], '`' );
 
-            // Verify the found field name
+            // Verify the found field name.
             $validfield = true;
             switch (strtolower($fieldname)) {
@@ -1688 +1709 @@
             $fld = trim($fld);
 
-            // If it's a valid field, add it to the field array
+            // If it's a valid field, add it to the field array.
             if ($validfield) {
                 $cfields[strtolower($fieldname)] = trim($fld, ", \n");
@@ -1694 +1715 @@
         }
 
-        // For every field in the table
+        // For every field in the table.
         foreach ($tablefields as $tablefield) {
-            // If the table field exists in the field array...
+
+            // If the table field exists in the field array ...
             if (array_key_exists(strtolower($tablefield->Field), $cfields)) {
-                // Get the field type from the query
+
+                // Get the field type from the query.
                 preg_match("|".$tablefield->Field." ([^ ]*( unsigned)?)|i", $cfields[strtolower($tablefield->Field)], $matches);
                 $fieldtype = $matches[1];
@@ -1710 +1733 @@
 
                 // Get the default value from the array
+                    // todo: Remove this?
                     //echo "{$cfields[strtolower($tablefield->Field)]}<br>";
                 if (preg_match("| DEFAULT '(.*?)'|i", $cfields[strtolower($tablefield->Field)], $matches)) {
@@ -1720 +1744 @@
                 }
 
-                // Remove the field from the array (so it's not added)
+                // Remove the field from the array (so it's not added).
                 unset($cfields[strtolower($tablefield->Field)]);
             } else {
@@ -1727 +1751 @@
         }
 
-        // For every remaining field specified for the table
+        // For every remaining field specified for the table.
         foreach ($cfields as $fieldname => $fielddef) {
-            // Push a query line into $cqueries that adds the field to that table
+            // Push a query line into $cqueries that adds the field to that table.
             $cqueries[] = "ALTER TABLE {$table} ADD COLUMN $fielddef";
             $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
         }
 
-        // Index stuff goes here
-        // Fetch the table index structure from the database
+        // Index stuff goes here. Fetch the table index structure from the database.
         $tableindices = $wpdb->get_results("SHOW INDEX FROM {$table};");
 
         if ($tableindices) {
-            // Clear the index array
+            // Clear the index array.
             unset($index_ary);
 
-            // For every index in the table
+            // For every index in the table.
             foreach ($tableindices as $tableindex) {
-                // Add the index to the index data array
+
+                // Add the index to the index data array.
                 $keyname = $tableindex->Key_name;
                 $index_ary[$keyname]['columns'][] = array('fieldname' => $tableindex->Column_name, 'subpart' => $tableindex->Sub_part);
@@ -1750 +1774 @@
             }
 
-            // For each actual index in the index array
+            // For each actual index in the index array.
             foreach ($index_ary as $index_name => $index_data) {
-                // Build a create string to compare to the query
+
+                // Build a create string to compare to the query.
                 $index_string = '';
                 if ($index_name == 'PRIMARY') {
@@ -1764 +1789 @@
                 }
                 $index_columns = '';
-                // For each column in the index
+
+                // For each column in the index.
                 foreach ($index_data['columns'] as $column_data) {
                     if ($index_columns != '') $index_columns .= ',';
-                    // Add the field to the column list string
+
+                    // Add the field to the column list string.
                     $index_columns .= $column_data['fieldname'];
                     if ($column_data['subpart'] != '') {
@@ -1773 +1800 @@
                     }
                 }
-                // Add the column list to the index create string
+                // Add the column list to the index create string.
                 $index_string .= ' ('.$index_columns.')';
                 if (!(($aindex = array_search($index_string, $indices)) === false)) {
                     unset($indices[$aindex]);
+                    // todo: Remove this?
                     //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
                 }
+                // todo: Remove this?
                 //else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
             }
         }
 
-        // For every remaining index specified for the table
+        // For every remaining index specified for the table.
         foreach ( (array) $indices as $index ) {
-            // Push a query line into $cqueries that adds the index to that table
+            // Push a query line into $cqueries that adds the index to that table.
             $cqueries[] = "ALTER TABLE {$table} ADD $index";
             $for_update[] = 'Added index ' . $table . ' ' . $index;
         }
 
-        // Remove the original table creation query from processing
+        // Remove the original table creation query from processing.
         unset( $cqueries[ $table ], $for_update[ $table ] );
     }
@@ -1797 +1826 @@
     if ($execute) {
         foreach ($allqueries as $query) {
+            // todo: Remove this?
             //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">".print_r($query, true)."</pre>\n";
             $wpdb->query($query);
@@ -1848 +1878 @@
         return false;
 
-    // Copy files from the old locations to the site theme.
-    // TODO: This does not copy arbitrary include dependencies. Only the
-    // standard WP files are copied.
+    /*
+     * Copy files from the old locations to the site theme.
+     * TODO: This does not copy arbitrary include dependencies. Only the standard WP files are copied.
+     */
     $files = array('index.php' => 'index.php', 'wp-layout.css' => 'style.css', 'wp-comments.php' => 'comments.php', 'wp-comments-popup.php' => 'comments-popup.php');
 
@@ -1859 +1890 @@
             $oldpath = ABSPATH;
 
-        if ($oldfile == 'index.php') { // Check to make sure it's not a new index
+        // Check to make sure it's not a new index.
+        if ($oldfile == 'index.php') {
             $index = implode('', file("$oldpath/$oldfile"));
             if (strpos($index, 'WP_USE_THEMES') !== false) {
                 if (! @copy(WP_CONTENT_DIR . '/themes/' . WP_DEFAULT_THEME . '/index.php', "$site_dir/$newfile"))
                     return false;
-                continue; // Don't copy anything
+
+                // Don't copy anything.
+                continue;
                 }
         }