Changeset 21849

Timestamp:

09/14/2012 07:12:35 PM (12 years ago)

Author:

nacin

Message:

If an option was not sent to options.php, pass null to update_option(), rather than trimming the null and converting it to an empty string. This provides better context for sanitize_option() while still storing what ends up being an empty string either way. see #16416.

File:

• trunk/wp-admin/options.php (modified) (1 diff)

trunk/wp-admin/options.php

@@ -140 +140 @@
                 _deprecated_argument( 'options.php', '2.7', sprintf( __( 'The <code>%1$s</code> setting is unregistered. Unregistered settings are deprecated. See http://codex.wordpress.org/Settings_API' ), $option, $option_page ) );
 
-            $option = trim($option);
+            $option = trim( $option );
             $value = null;
-            if ( isset($_POST[$option]) )
-                $value = $_POST[$option];
-            if ( !is_array($value) )
-                $value = trim($value);
-            $value = stripslashes_deep($value);
-            update_option($option, $value);
+            if ( isset( $_POST[ $option ] ) ) {
+                $value = $_POST[ $option ];
+                if ( ! is_array( $value ) )
+                    $value = trim( $value );
+                $value = stripslashes_deep( $value );
+            }
+            update_option( $option, $value );
         }
     }