Changeset 2966

Timestamp:

10/27/05 22:04:12 (3 years ago)

Author:

ryan

Message:

DB versioning. fixes #1791

Files:

• trunk/wp-admin/install.php (modified) (2 diffs)
• trunk/wp-admin/upgrade-functions.php (modified) (3 diffs)
• trunk/wp-admin/upgrade-schema.php (modified) (2 diffs)
• trunk/wp-includes/version.php (modified) (1 diff)

trunk/wp-admin/install.php

@@ -139 +139 @@
-make_db_current_silent();
-populate_options();
+populate_roles();
-
-$wpdb->query("UPDATE $wpdb->options SET option_value = '$weblog_title' WHERE option_name = 'blogname'");
@@ -197 +198 @@
-@wp_mail($admin_email, __('New WordPress Blog'), $message, $message_headers);
-
-upgrade_all();
-?>
-

trunk/wp-admin/upgrade-functions.php

@@ -5 +5 @@
-// Functions to be called in install and upgrade scripts
-function upgrade_all() {
+    global $wp_current_db_version, $wp_db_version;
+    $wp_current_db_version = __get_option('db_version');
+
+    // We are up-to-date.  Nothing to do.
+    if ( $wp_db_version == $wp_current_db_version )
+        return;
+
+    // If the version is not set in the DB, try to guess the version.
+    if ( empty($wp_current_db_version) ) {
+        $wp_current_db_version = 0;
+
+        // If the template option exists, we have 1.5.
+        $template = __get_option('template');
+        if ( !empty($template) )
+            $wp_current_db_version = 2541;
+    }
+    
-    populate_options();
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    save_mod_rewrite_rules();
+    
+    update_option('db_version', $wp_db_version);
-}
-
@@ -83 +108 @@
-
-function upgrade_110() {
-  
+   
-    
-    // Set user_nicename.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    $users = $wpdb->get_results("SELECT ID, user_pass from $wpdb->users");
@@ -219 +242 @@
-function upgrade_160() {
-    global $wpdb, $table_prefix;
+    
+    populate_roles_160();
+
-    $users = $wpdb->get_results("SELECT * FROM $wpdb->users");
-    foreach ( $users as $user ) :

trunk/wp-admin/upgrade-schema.php

@@ -223 +223 @@
-    add_option('rich_editing', 'true');
-
-    populate_roles();
-
-    // Delete unused options
-    $unusedoptions = array ('blodotgsping_url', 'bodyterminator', 'emailtestonly', 'phoneemail_separator', 'smilies_directory', 'subjectprefix', 'use_bbcode', 'use_blodotgsping', 'use_phoneemail', 'use_quicktags', 'use_weblogsping', 'weblogs_cache_file', 'use_preview', 'use_htmltrans', 'smilies_directory', 'fileupload_allowedusers', 'use_phoneemail', 'default_post_status', 'default_post_category', 'archive_mode', 'time_difference', 'links_minadminlevel', 'links_use_adminlevels', 'links_rating_type', 'links_rating_char', 'links_rating_ignore_zero', 'links_rating_single_image', 'links_rating_image0', 'links_rating_image1', 'links_rating_image2', 'links_rating_image3', 'links_rating_image4', 'links_rating_image5', 'links_rating_image6', 'links_rating_image7', 'links_rating_image8', 'links_rating_image9', 'weblogs_cacheminutes', 'comment_allowed_tags', 'search_engine_friendly_urls', 'default_geourl_lat', 'default_geourl_lon', 'use_default_geourl', 'weblogs_xml_url', 'new_users_can_blog');
@@ -239 +237 @@
-
-function populate_roles() {
+    populate_roles_160();   
+}
+
+function populate_roles_160() {
-    global $wp_roles;
-

trunk/wp-includes/version.php

@@ -4 +4 @@
-
-$wp_version = '1.6-ALPHA-2-still-dont-use';
+$wp_db_version = 2966;
-
-?>