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

Timestamp:

08/29/2008 07:25:45 AM (17 years ago)

Author:

azaozz

Message:

Pass default value to get_option(), fixes #7637

File:

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

trunk/wp-includes/functions.php

@@ -331 +331 @@
  * @return mixed Value set for the option.
  */
-function get_option( $setting ) {
+function get_option( $setting, $default = false ) {
     global $wpdb;
 
@@ -342 +342 @@
     $notoptions = wp_cache_get( 'notoptions', 'options' );
     if ( isset( $notoptions[$setting] ) )
-        return false;
+        return $default;
 
     $alloptions = wp_load_alloptions();
@@ -365 +365 @@
                 $notoptions[$setting] = true;
                 wp_cache_set( 'notoptions', $notoptions, 'options' );
-                return false;
+                return $default;
             }
         }