Changeset 3023

Timestamp:

11/09/2005 06:15:55 PM (19 years ago)

Author:

ryan

Message:

Options fixes from donncha. fixes #1859

Location:

trunk

Files:

• wp-admin/options.php (modified) (1 diff)
• wp-includes/functions.php (modified) (4 diffs)

trunk/wp-admin/options.php

@@ -59 +59 @@
             if ($new_val !== $old_val) {
                 $result = $wpdb->query("UPDATE $wpdb->options SET option_value = '$new_val' WHERE option_name = '$option->option_name'");
+                wp_cache_set($option->option_name, $new_val, 'options');
                 $any_changed++;
             }

trunk/wp-includes/functions.php

@@ -268 +268 @@
 
     if ( false === $value ) {
-        $value = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
-        wp_cache_add($setting, $value, 'options');
+        $value = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
+        if( is_object( $value ) ) {
+            $value = $value->option_value;
+            wp_cache_set($setting, $value, 'options');
+        }
     }
 
@@ -344 +347 @@
     // If it's not there add it
     if ( !$wpdb->get_var("SELECT option_name FROM $wpdb->options WHERE option_name = '$option_name'") )
-        add_option($option_name);
+        add_option($option_name, $newvalue);
 
     wp_cache_set($option_name, $newvalue, 'options');
@@ -366 +369 @@
 
     // Make sure the option doesn't already exist
-    if ( false !== get_option($name, 'options') )
+    if ( false !== get_option($name) )
         return;
 
@@ -373 +376 @@
         $value = serialize($value);
 
-    wp_cache_add($name, $value, 'options');
+    wp_cache_set($name, $value, 'options');
 
     $name = $wpdb->escape($name);