Ticket #7637: get_option.patch

wp-includes/functions.php

@@ -330 +330 @@
  * @param string $setting Name of option to retrieve. Should already be SQL-escaped
  * @return mixed Value set for the option.
  */
-function get_option( $setting ) {
+function get_option( $setting, $default = false ) {
         global $wpdb;
 
         // Allow plugins to short-circuit options.
@@ -341 +341 @@
         // prevent non-existent options from triggering multiple queries
         $notoptions = wp_cache_get( 'notoptions', 'options' );
         if ( isset( $notoptions[$setting] ) )
-                return false;
+                return $default;
 
         $alloptions = wp_load_alloptions();
 
@@ -364 +364 @@
                         } else { // option does not exist, so we must cache its non-existence
                                 $notoptions[$setting] = true;
                                 wp_cache_set( 'notoptions', $notoptions, 'options' );
-                                return false;
+                                return $default;
                         }
                 }
         }