WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Deprecate is_site_admin. Props nacin. see #11644 

git-svn-id: http://svn.automattic.com/wordpress/trunk@12645 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-01-07 15:50:46 +00:00
parent 40efc5b7f4
commit 53324a6983
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
wp-includes/ms-deprecated.php
View File

@ -23,4 +23,37 @@ function generate_random_password( $len = 8 ) {
return wp_generate_password($len);
}
/**
* Determine if user is a site admin.
*
* Plugins should use is_multisite() instead of checking if this function exists
* to determine if multisite is enabled.
*
* This function must reside in a file included only if is_multisite() due to
* legacy function_exists() checks to determine if multisite is enabled.
*
* @since unknown
* @deprecated 3.0
* @deprecated Use is_super_admin()
* @see is_super_admin()
* @see is_multisite()
*
*/
function is_site_admin( $user_login = '' ) {
_deprecated_function( __FUNCTION__, '3.0', 'is_super_admin()' );
if ( empty( $user_login ) ) {
$user_id = get_current_user_id();
if ( !$user_id )
return false;
} else {
$user = new WP_User( null, $user_login) ;
if ( empty( $user->id ) )
return false;
$user_id = $user->id;
}
return is_super_admin( $user_id );
}
?>

24
wp-includes/ms-functions.php
View File

@ -183,30 +183,6 @@ function get_current_user_id() {
return $current_user->ID;
}
/**
* Determine if user is a site admin.
*
* @deprecated Use {@link is_keymaster()}
*
*/
function is_site_admin( $user_login = '' ) {
// This function must reside in a file included only if is_multsite() since many plugins
// test for its existence to determine if multisite is enabled.
if ( empty($user_login) ) {
$user_id = get_current_user_id();
if ( !$user_id )
return false;
} else {
$user = new WP_User(null, $user_login);
if ( empty($user->id) )
return false;
$user_id = $user->id;
}
return is_super_admin($user_id);
}
/**
* Retrieve option value based on setting name and blog_id.
*