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

Timestamp:

11/17/2012 01:20:57 PM (12 years ago)

Author:

nacin

Message:

Trim the option name in get_option() before calling the pre_option_$option filter, not after. props evansolomon. fixes #22358.

File:

• trunk/wp-includes/option.php (modified) (1 diff)

trunk/wp-includes/option.php

@@ -33 +33 @@
     global $wpdb;
 
+    $option = trim( $option );
+    if ( empty( $option ) )
+        return false;
+
     // Allow plugins to short-circuit options.
     $pre = apply_filters( 'pre_option_' . $option, false );
     if ( false !== $pre )
         return $pre;
-
-    $option = trim($option);
-    if ( empty($option) )
-        return false;
 
     if ( defined( 'WP_SETUP_CONFIG' ) )