WordPress.org

Make WordPress Core


Ignore:
Timestamp:
03/16/2010 08:59:26 PM (11 years ago)
Author:
nacin
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/options.php

    r13711 r13721  
    108108        wp_die( __( 'Error: options page not found.' ) );
    109109
    110     if ( 'options' == $option_page )
    111         $options = explode(',', stripslashes( $_POST[ 'page_options' ] ));
    112         if( is_multisite() && !is_super_admin() )
     110    if ( 'options' == $option_page ) {
     111        if ( is_multisite() && ! is_super_admin() )
    113112            wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
    114     else
     113        $options = explode( ',', stripslashes( $_POST[ 'page_options' ] ) );
     114    } else {
    115115        $options = $whitelist_options[ $option_page ];
     116    }
    116117
    117118    // Handle custom date/time formats
     
    135136        } else {
    136137            $whitelist_check = false;
    137             _deprecated_argument( 'options.php', '2.6', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
     138            _deprecated_argument( 'options.php', '2.7', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
    138139        }
    139140        foreach ( $options as $option ) {
    140141            if ( $whitelist_check && !in_array( $option, $registered ) ) {
    141                 _deprecated_argument( 'options.php', '2.6', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
     142                _deprecated_argument( 'options.php', '2.7', __( 'Unregistered settings are deprecated. Register your theme/plugin settings.' ) );
    142143                $whitelist_check = false;
    143144            }
Note: See TracChangeset for help on using the changeset viewer.