Changeset 20784 for trunk/wp-includes/option.php

Timestamp:

05/14/2012 05:00:13 PM (13 years ago)

Author:

ryan

Message:

Call filters for default option values only as needed to reduce number of filter calls. Props Ott042. see #20448

File:

• trunk/wp-includes/option.php (modified) (5 diffs)

trunk/wp-includes/option.php

@@ -45 +45 @@
         return false;
 
-    $default = apply_filters( 'default_option_' . $option, $default );
-
     if ( ! defined( 'WP_INSTALLING' ) ) {
         // prevent non-existent options from triggering multiple queries
         $notoptions = wp_cache_get( 'notoptions', 'options' );
         if ( isset( $notoptions[$option] ) )
-            return $default;
+            return apply_filters( 'default_option_' . $option, $default );
 
         $alloptions = wp_load_alloptions();
@@ -70 +68 @@
                     $notoptions[$option] = true;
                     wp_cache_set( 'notoptions', $notoptions, 'options' );
-                    return $default;
+                    return apply_filters( 'default_option_' . $option, $default );
                 }
             }
@@ -81 +79 @@
             $value = $row->option_value;
         else
-            return $default;
+            return apply_filters( 'default_option_' . $option, $default );
     }
 
@@ -757 +755 @@
         return $pre;
 
-    $default = apply_filters( 'default_site_option_' . $option, $default );
-
-    if ( !is_multisite() ) {
+    if ( ! is_multisite() ) {
+        $default = apply_filters( 'default_site_option_' . $option, $default );
         $value = get_option($option, $default);
     } else {
@@ -775 +772 @@
                 wp_cache_set( $cache_key, $value, 'site-options' );
             } else {
-                $value = $default;
+                $value = apply_filters( 'default_site_option_' . $option, $default );
             }
         }