Index: wp-admin/includes/user.php
===================================================================
--- wp-admin/includes/user.php	(revision 14026)
+++ wp-admin/includes/user.php	(working copy)
@@ -79,7 +79,7 @@
 		$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
Index: wp-includes/ms-deprecated.php
===================================================================
--- wp-includes/ms-deprecated.php	(revision 14026)
+++ wp-includes/ms-deprecated.php	(working copy)
@@ -101,7 +101,7 @@
  * @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;
 }