Changeset 13858

Timestamp:

03/28/2010 03:10:37 AM (16 years ago)

Author:

dd32

Message:

Do not allow empty option names. Trim leading and trailing whitespace from option names. Partial patch props ericmann. Fixes #11506

File:

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

trunk/wp-includes/functions.php

@@ -319 +319 @@
                 return $pre;
 
+        $option = trim($option);
+        if ( empty($option) )
+                return false;
+
         // prevent non-existent options from triggering multiple queries
         if ( defined( 'WP_INSTALLING' ) && is_multisite() ) {
@@ -489 +493 @@
         global $wpdb;
 
+        $option = trim($option);
+        if ( empty($option) )
+                return false;
+
         wp_protect_special_option( $option );
 
@@ -560 +568 @@
  */
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
+        global $wpdb;
+
         if ( !empty( $deprecated ) )
                 _deprecated_argument( __FUNCTION__, '2.3' );
 
-        global $wpdb;
+        $option = trim($option);
+        if ( empty($option) )
+                return false;
 
         wp_protect_special_option( $option );