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

User is_super_admin(). Props ocean90. fixes #12888 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14032 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2010-04-07 15:28:10 +00:00
parent 96bc63439a
commit f609d0c8a3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/includes/user.php
View File

@ -79,7 +79,7 @@ function edit_user( $user_id = 0 ) {
$potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
// Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
// Multisite super admins can freely edit their blog roles -- they possess all caps.
if ( ( is_multisite() && is_site_admin() ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
if ( ( is_multisite() && is_super_admin() ) || $user_id != $current_user->id || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
$user->role = $new_role;
// If the new role isn't editable by the logged-in user die with error

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

@ -101,7 +101,7 @@ endif;
* @deprecated Use $GLOBALS['current_user']->ID
*/
function get_current_user_id() {
_deprecated_function( __FUNCTION__, '3.0', '$GLOBALS\'current_user\']->ID' );
_deprecated_function( __FUNCTION__, '3.0', '$GLOBALS[\'current_user\']->ID' );
return $GLOBALS['current_user']->ID;
}