Changeset 3067

Timestamp:

11/14/2005 06:51:09 AM (20 years ago)

Author:

ryan

Message:

Don't return false from get_settings() when installing. Use update_option() when setting the blog title and admin email so that the cache is kept in sync. fixes #1869

Location:

trunk

Files:

• wp-admin/install.php (modified) (1 diff)
• wp-includes/functions.php (modified) (1 diff)

trunk/wp-admin/install.php

@@ -142 +142 @@
 populate_roles();
 
-$wpdb->query("UPDATE $wpdb->options SET option_value = '$weblog_title' WHERE option_name = 'blogname'");
-$wpdb->query("UPDATE $wpdb->options SET option_value = '$admin_email' WHERE option_name = 'admin_email'");
+update_option('blogname', $weblog_title);
+update_option('admin_email', $admin_email);
 
 // Now drop in some default links

trunk/wp-includes/functions.php

@@ -262 +262 @@
 function get_settings($setting) {
     global $wpdb;
-    if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') || defined('WP_INSTALLING') )
-        return false;
 
     $value = wp_cache_get($setting, 'options');
 
     if ( false === $value ) {
+        if ( defined('WP_INSTALLING') )
+            $wpdb->hide_errors();
         $value = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
+        if ( defined('WP_INSTALLING') )
+            $wpdb->show_errors();
+
         if( is_object( $value ) ) {
             $value = $value->option_value;