Changeset 3517 for trunk/wp-admin/upgrade-functions.php

Timestamp:

02/12/2006 07:53:23 AM (19 years ago)

Author:

ryan

Message:

Death to trailing tabs. Props Mark J. fixes #2405

File:

• trunk/wp-admin/upgrade-functions.php (modified) (22 diffs)

trunk/wp-admin/upgrade-functions.php

@@ -21 +21 @@
             $wp_current_db_version = 2541;
     }
-    
+
     populate_options();
 
@@ -30 +30 @@
         upgrade_130();
     }
-    
+
     if ( $wp_current_db_version < 3308 )
         upgrade_160();
@@ -38 +38 @@
 
     $wp_rewrite->flush_rules();
-    
+
     update_option('db_version', $wp_db_version);
 }
@@ -55 +55 @@
         }
     }
-    
+
     $categories = $wpdb->get_results("SELECT cat_ID, cat_name, category_nicename FROM $wpdb->categories");
     foreach ($categories as $category) {
@@ -78 +78 @@
         $catwhere = '';
     endif;
-    
+
     $allposts = $wpdb->get_results("SELECT ID, post_category FROM $wpdb->posts WHERE post_category != '0' $catwhere");
     if ($allposts) :
@@ -112 +112 @@
 function upgrade_110() {
     global $wpdb;
-    
+
     // Set user_nicename.
     $users = $wpdb->get_results("SELECT ID, user_nickname, user_nicename FROM $wpdb->users");
@@ -281 +281 @@
             $wpdb->query("UPDATE $wpdb->users SET display_name = '$id' WHERE ID = '$user->ID'");
         endif;
-        
+
         // FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
         $caps = get_usermeta( $user->ID, $table_prefix . 'capabilities');
@@ -289 +289 @@
             update_usermeta( $user->ID, $table_prefix . 'capabilities', array($role => true) );
         }
-            
+
     endforeach;
     $old_user_fields = array( 'user_firstname', 'user_lastname', 'user_icq', 'user_aim', 'user_msn', 'user_yim', 'user_idmode', 'user_ip', 'user_domain', 'user_browser', 'user_description', 'user_nickname', 'user_level' );
@@ -296 +296 @@
         $wpdb->query("ALTER TABLE $wpdb->users DROP $old");
     $wpdb->show_errors();
-    
+
     if ( 0 == $wpdb->get_var("SELECT SUM(category_count) FROM $wpdb->categories") ) { // Create counts
         $categories = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories");
@@ -322 +322 @@
             post_type = ''
             WHERE ID = $object->ID");
-            
+
             $meta = get_post_meta($object->ID, 'imagedata', true);
             if ( ! empty($meta['file']) )
@@ -336 +336 @@
         // Update status and type.
         $posts = $wpdb->get_results("SELECT ID, post_status FROM $wpdb->posts");
-    
+
         if ( ! empty($posts) ) foreach ($posts as $post) {
             $status = $post->post_status;
@@ -346 +346 @@
             } else if ( 'attachment' == $status ) {
                 $status = 'inherit';
-                $type = 'attachment';   
+                $type = 'attachment';
             }
-        
+
             $wpdb->query("UPDATE $wpdb->posts SET post_status = '$status', post_type = '$type' WHERE ID = '$post->ID'");
         }
     }
-    
+
     if ( $wp_current_db_version < 3513 ) {
-        populate_roles_210();   
+        populate_roles_210();
     }
 }
@@ -478 +478 @@
 function dbDelta($queries, $execute = true) {
     global $wpdb;
-    
+
     // Seperate individual queries into an array
     if( !is_array($queries) ) {
@@ -484 +484 @@
         if('' == $queries[count($queries) - 1]) array_pop($queries);
     }
-    
+
     $cqueries = array(); // Creation Queries
     $iqueries = array(); // Insertion Queries
     $for_update = array();
-    
+
     // Create a tablename index for an array ($cqueries) of queries
     foreach($queries as $qry) {
@@ -507 +507 @@
             // Unrecognized query type
         }
-    }   
+    }
 
     // Check to see which tables and fields exist
@@ -526 +526 @@
 
                 //echo "<hr/><pre>\n".print_r(strtolower($table), true).":\n".print_r($cqueries, true)."</pre><hr/>";
-                
+
                 // For every field line specified in the query
                 foreach($flds as $fld) {
@@ -532 +532 @@
                     preg_match("|^([^ ]*)|", trim($fld), $fvals);
                     $fieldname = $fvals[1];
-                    
+
                     // Verify the found field name
                     $validfield = true;
@@ -548 +548 @@
                     }
                     $fld = trim($fld);
-                    
+
                     // If it's a valid field, add it to the field array
                     if($validfield) {
@@ -554 +554 @@
                     }
                 }
-                
+
                 // Fetch the table column structure from the database
                 $tablefields = $wpdb->get_results("DESCRIBE {$table};");
-                                
+
                 // For every field in the table
-                foreach($tablefields as $tablefield) {              
+                foreach($tablefields as $tablefield) {
                     // If the table field exists in the field array...
                     if(array_key_exists(strtolower($tablefield->Field), $cfields)) {
@@ -572 +572 @@
                             $for_update[$table.'.'.$tablefield->Field] = "Changed type of {$table}.{$tablefield->Field} from {$tablefield->Type} to {$fieldtype}";
                         }
-                        
+
                         // Get the default value from the array
                             //echo "{$cfields[strtolower($tablefield->Field)]}<br>";
@@ -599 +599 @@
                     $for_update[$table.'.'.$fieldname] = 'Added column '.$table.'.'.$fieldname;
                 }
-                
+
                 // 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
@@ -632 +632 @@
                         $index_columns = '';
                         // For each column in the index
-                        foreach($index_data['columns'] as $column_data) {                   
+                        foreach($index_data['columns'] as $column_data) {
                             if($index_columns != '') $index_columns .= ',';
                             // Add the field to the column list string