Changeset 763

Timestamp:

01/12/2004 12:50:32 PM (22 years ago)

Author:

saxmatt

Message:

More upgrade fixes for b2.

Location:

trunk

Files:

• wp-admin/import-b2.php (modified) (2 diffs)
• wp-admin/upgrade-functions.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/import-b2.php

@@ -2 +2 @@
 if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config.sample.php with the proper database connection information and renamed it to wp-config.php.");
 require_once('../wp-config.php');
-
+require('upgrade-functions.php');
 $step = $HTTP_GET_VARS['step'];
 if (!$step) $step = 0;
@@ -241 +241 @@
 
 $q = $wpdb->query($query);
-upgrade_071();
-upgrade_072();
-upgrade_100();
-?>
-
-<p>Don't forget to CHMOD the <code>weblogs.com.changes.cache</code> file and you'll 
-  be A-okay. Welcome to the family.</p>
+upgrade_all();
+?>
+
+<p>Welcome to the family. <a href="../">Have fun</a>!</p>
   <?php
     break;

trunk/wp-admin/upgrade-functions.php

@@ -166 +166 @@
     }
 
+    // Guess a site URI
+$guessurl = preg_replace('|/wp-admin/.*|i', '', 'http://' . $HTTP_HOST . $REQUEST_URI);
     $option_data = array(       //base options from b2cofig
-        "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (1,'siteurl', 3, 'http://example.com', 'siteurl is your blog\'s URL: for example, \'http://example.com/wordpress\' (no trailing slash !)', 8, 30)",
+        "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (1,'siteurl', 3, '$guessurl', 'siteurl is your blog\'s URL: for example, \'http://example.com/wordpress\'', 8, 30)",
         "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (2,'blogfilename', 3, 'index.php', 'blogfilename is the name of the default file for your blog', 8, 20)",
         "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (3,'blogname', 3, 'my weblog', 'blogname is the name of your blog', 8, 20)",

trunk/wp-settings.php

@@ -45 +45 @@
 // get_settings() wherever these are needed OR
 // accessing a single global $all_settings var
-if (!strstr($HTTP_SERVER_VARS['REQUEST_URI'], 'install.php')) {
+if (!strstr($HTTP_SERVER_VARS['REQUEST_URI'], 'install.php') && !strstr($HTTP_SERVER_VARS['REQUEST_URI'], 'wp-admin/import')) {
     $siteurl = get_settings('siteurl');
     // "When trying to design a foolproof system,