IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@12825 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2010-01-25 21:33:49 +00:00
parent f3939dd8fd
commit 9469c9f02a
4 changed files with 47 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-admin/includes/ms.php
-23
View File
@@ -562,29 +562,6 @@ function redirect_user_to_blog() {
}
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 ) {
if ( !is_super_admin() )
return false;