Changeset 12825

Timestamp:

01/25/2010 09:33:49 PM (16 years ago)

Author:

ryan

Message:

Deprecate mu_options. Integrate directly into options.php. see #11644

Location:

trunk/wp-admin

Files:

• includes/ms-deprecated.php (modified) (1 diff)
• includes/ms.php (modified) (1 diff)
• includes/plugin.php (modified) (4 diffs)
• options.php (modified) (3 diffs)

trunk/wp-admin/includes/ms-deprecated.php

@@ -29 +29 @@
 }
 
+/**
+ * @deprecated 3.0
+ */
+function mu_options( $options ) {
+        _deprecated_function(__FUNCTION__, '3.0', '' );
+        return $options;
+}
+
 ?>

trunk/wp-admin/includes/ms.php

@@ -562 +562 @@
 }
 add_action( 'admin_page_access_denied', 'redirect_user_to_blog', 99 );
-
-function mu_options( $options ) {
-        if ( defined( 'POST_BY_EMAIL' ) ) {
-                $writing = array( 'ping_sites' );
-        } else {
-                $writing = array( 'ping_sites', 'mailserver_login', 'mailserver_pass', 'default_email_category', 'mailserver_port', 'mailserver_url' );
-        }
-        $removed = array(
-                'general' => array( 'siteurl', 'home', 'admin_email', 'users_can_register', 'default_role' ),
-                'reading' => array( 'gzipcompression' ),
-                'writing' => $writing,
-        );
-
-        $added = array( 'general' => array( 'new_admin_email', 'WPLANG', 'language' ) );
-
-        $options[ 'misc' ] = array();
-
-        $options = remove_option_whitelist( $removed, $options );
-        $options = add_option_whitelist( $added, $options );
-
-        return $options;
-}
-add_filter( 'whitelist_options', 'mu_options' );
 
 function check_import_new_users( $permission ) {

trunk/wp-admin/includes/plugin.php

@@ -1065 +1065 @@
  */
 function add_option_whitelist( $new_options, $options = '' ) {
-        if ( $options == '' ) {
+        if ( $options == '' )
                 global $whitelist_options;
-        } else {
+        else
                 $whitelist_options = $options;
-        }
-        foreach( $new_options as $page => $keys ) {
-                foreach( $keys as $key ) {
+
+        foreach ( $new_options as $page => $keys ) {
+                foreach ( $keys as $key ) {
                         if ( !isset($whitelist_options[ $page ]) || !is_array($whitelist_options[ $page ]) ) {
                                 $whitelist_options[ $page ] = array();
@@ -1082 +1082 @@
                 }
         }
+
         return $whitelist_options;
 }
@@ -1095 +1096 @@
  */
 function remove_option_whitelist( $del_options, $options = '' ) {
-        if ( $options == '' ) {
+        if ( $options == '' )
                 global $whitelist_options;
-        } else {
+        else
                 $whitelist_options = $options;
-        }
-        foreach( $del_options as $page => $keys ) {
-                foreach( $keys as $key ) {
+
+        foreach ( $del_options as $page => $keys ) {
+                foreach ( $keys as $key ) {
                         if ( isset($whitelist_options[ $page ]) && is_array($whitelist_options[ $page ]) ) {
                                 $pos = array_search( $key, $whitelist_options[ $page ] );
@@ -1109 +1110 @@
                 }
         }
+
         return $whitelist_options;
 }

trunk/wp-admin/options.php

@@ -23 +23 @@
 
 $whitelist_options = array(
-        'general' => array( 'blogname', 'blogdescription', 'admin_email', 'users_can_register', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'default_role', 'timezone_string' ),
+        'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string' ),
         'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
         'misc' => array( 'use_linksupdate', 'uploads_use_yearmonth_folders', 'upload_path', 'upload_url_path' ),
@@ -29 +29 @@
         'privacy' => array( 'blog_public' ),
         'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'blog_charset', 'show_on_front', 'page_on_front', 'page_for_posts' ),
-        'writing' => array( 'default_post_edit_rows', 'use_smilies', 'ping_sites', 'mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),
+        'writing' => array( 'default_post_edit_rows', 'use_smilies', 'default_category', 'default_email_category', 'use_balanceTags', 'default_link_category', 'enable_app', 'enable_xmlrpc' ),
         'options' => array( '' ) );
-if ( !defined( 'WP_SITEURL' ) ) $whitelist_options['general'][] = 'siteurl';
-if ( !defined( 'WP_HOME' ) ) $whitelist_options['general'][] = 'home';
+
+$mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
+
+if ( !is_multisite() ) {
+        if ( !defined( 'WP_SITEURL' ) ) $whitelist_options['general'][] = 'siteurl';
+        if ( !defined( 'WP_HOME' ) ) $whitelist_options['general'][] = 'home';
+        $whitelist_options['general'][] = 'admin_email';
+        $whitelist_options['general'][] = 'users_can_register';
+        $whitelist_options['general'][] = 'default_role';
+
+        $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+        $whitelist_options['writing'][] = 'ping_sites';
+} else {
+        $whitelist_options['general'][] = 'new_admin_email';
+        $whitelist_options['general'][] = 'WPLANG';
+        $whitelist_options['general'][] = 'language';
+
+        $whitelist_options[ 'misc' ] = array();
+
+        if ( defined( 'POST_BY_EMAIL' ) )
+                $whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+
+        $whitelist_options[ 'misc' ] = array();
+}
 
 $whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
@@ -39 +61 @@
         wp_die(__('Cheatin’ uh?'));
 
-if ( is_multisite() && is_super_admin() && $_GET[ 'adminhash' ] ) {
+if ( is_multisite() && is_super_admin() && isset($_GET[ 'adminhash' ]) && $_GET[ 'adminhash' ] ) {
         $new_admin_details = get_option( 'adminhash' );
         if ( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && $new_admin_details[ 'newemail' ] != '' ) {