Changeset 5394 for branches/2.2/wp-admin/upgrade-functions.php

Timestamp:

05/05/2007 12:17:05 AM (17 years ago)

Author:

rob1n

Message:

Use WP_HOME and WP_SITEURL in upgrading. Props filosofo. fixes #4211

File:

• branches/2.2/wp-admin/upgrade-functions.php (modified) (1 diff)

branches/2.2/wp-admin/upgrade-functions.php

@@ -660 +660 @@
 function __get_option($setting) {
     global $wpdb;
-
+    
+    if ( $setting == 'home' && defined( 'WP_HOME' ) ) {
+        return preg_replace( '|/+$|', '', constant( 'WP_HOME' ) );
+    }
+    
+    if ( $setting == 'siteurl' && defined( 'WP_SITEURL' ) ) {
+        return preg_replace( '|/+$|', '', constant( 'WP_SITEURL' ) );
+    }
+    
     $option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");