Changeset 29206 for trunk/src/wp-admin/includes/schema.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/schema.php (modified) (8 diffs)

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

@@ -206 +206 @@
 ) $charset_collate;\n";
 
-    // usermeta
+    // Usermeta.
     $usermeta_table = "CREATE TABLE $wpdb->usermeta (
   umeta_id bigint(20) unsigned NOT NULL auto_increment,
@@ -523 +523 @@
         $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, autoload) VALUES " . $insert);
 
-    // in case it is set, but blank, update "home"
+    // In case it is set, but blank, update "home".
     if ( !__get_option('home') ) update_option('home', $guessurl);
 
-    // Delete unused options
+    // Delete unused options.
     $unusedoptions = array(
         'blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory',
@@ -548 +548 @@
         delete_option($option);
 
-    // delete obsolete magpie stuff
+    // Delete obsolete magpie stuff.
     $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'");
 
-    // 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->options a, $wpdb->options b
@@ -820 +822 @@
         $role->add_cap( 'remove_users' );
 
-        // Never used, will be removed. create_users or
-        // promote_users is the capability you're looking for.
+        /*
+         * Never used, will be removed. create_users or promote_users
+         * is the capability you're looking for.
+         */
         $role->add_cap( 'add_users' );
 
@@ -864 +868 @@
         $errors->add( 'empty_sitename', __( 'You must provide a name for your network of sites.' ) );
 
-    // check for network collision
+    // Check for network collision.
     if ( $network_id == $wpdb->get_var( $wpdb->prepare( "SELECT id FROM $wpdb->site WHERE id = %d", $network_id ) ) )
         $errors->add( 'siteid_exists', __( 'The network already exists.' ) );
@@ -875 +879 @@
         return $errors;
 
-    // set up site tables
+    // Set up site tables.
     $template = get_option( 'template' );
     $stylesheet = get_option( 'stylesheet' );
@@ -921 +925 @@
 
     $misc_exts = array(
-        // images
+        // Images.
         'jpg', 'jpeg', 'png', 'gif',
-        // video
+        // Video.
         'mov', 'avi', 'mpg', '3gp', '3g2',
-        // "audio"
+        // "audio".
         'midi', 'mid',
-        // misc
+        // Miscellaneous.
         'pdf', 'doc', 'ppt', 'odt', 'pptx', 'docx', 'pps', 'ppsx', 'xls', 'xlsx', 'key',
     );
@@ -982 +986 @@
     $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
 
-    // When upgrading from single to multisite, assume the current site will become the main site of the network.
-    // When using populate_network() to create another network in an existing multisite environment,
-    // skip these steps since the main site of the new network has not yet been created.
+    /*
+     * When upgrading from single to multisite, assume the current site will
+     * become the main site of the network. When using populate_network()
+     * to create another network in an existing multisite environment, skip
+     * these steps since the main site of the new network has not yet been
+     * created.
+     */
     if ( ! is_multisite() ) {
         $current_site = new stdClass;