Changeset 13721

Timestamp:

03/16/2010 08:59:26 PM (17 years ago)

Author:

nacin

Message:

Fix branching, and correct deprecated version numbers. see #11730

File:

• trunk/wp-admin/options.php (modified) (2 diffs)

trunk/wp-admin/options.php

@@ -108 +108 @@
                 wp_die( __( 'Error: options page not found.' ) );
 
-        if ( 'options' == $option_page )
-                $options = explode(',', stripslashes( $_POST[ 'page_options' ] ));
-                if( is_multisite() && !is_super_admin() )
+        if ( 'options' == $option_page ) {
+                if ( is_multisite() && ! is_super_admin() )
                         wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
-        else
+                $options = explode( ',', stripslashes( $_POST[ 'page_options' ] ) );
+        } else {
                 $options = $whitelist_options[ $option_page ];
+        }
 
         // Handle custom date/time formats
@@ -135 +136 @@
                 } else {
                         $whitelist_check = false;
-                        _deprecated_argument( 'options.php', '2.6', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
+                        _deprecated_argument( 'options.php', '2.7', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
                 }
                 foreach ( $options as $option ) {
                         if ( $whitelist_check && !in_array( $option, $registered ) ) {
-                                _deprecated_argument( 'options.php', '2.6', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
+                                _deprecated_argument( 'options.php', '2.7', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
                                 $whitelist_check = false;
                         }