Changeset 1723 for trunk/wp-includes/functions.php

Timestamp:

09/29/2004 08:33:05 PM (22 years ago)

Author:

michelvaldrighi

Message:

rather ugly fix to prevent the querying of unknown/removed options, feel free to replace it with a better alternative someday

File:

• trunk/wp-includes/functions.php (modified) (3 diffs)

trunk/wp-includes/functions.php

@@ -300 +300 @@
 
 function get_settings($setting) {
-        global $wpdb, $cache_settings;
+  global $wpdb, $cache_settings, $cache_nonexistantoptions;
         if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') || strstr($_SERVER['REQUEST_URI'], 'wp-admin/upgrade.php') )
                 return false;
@@ -306 +306 @@
         if ( empty($cache_settings) )
                 $cache_settings = get_alloptions();
+
+        if ( empty($cache_nonexistantoptions) )
+                $cache_nonexistantoptions = array();
 
         if ('home' == $setting && '' == $cache_settings->home)
@@ -313 +316 @@
                 return $cache_settings->$setting;
         else :
+                // for these cases when we're asking for an unknown option
+                if ( isset($cache_nonexistantoptions[$setting]) )
+                        return false;
+
                 $option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
+
+                if (!$option) :
+                        $cache_nonexistantoptions[] = $setting;
+                        return false;
+                endif;
+          
                 if (@ $kellogs =  unserialize($option) ) return $kellogs;
                 else return $option;