WP Merge and new features

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@550 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 13 insertions, 11 deletions

diff --git a/wp-inst/wp-admin/user-edit.php b/wp-inst/wp-admin/user-edit.php
index 5966f1a..3d394a4 100644
--- a/wp-inst/wp-admin/user-edit.php
+++ b/wp-inst/wp-admin/user-edit.php
@@ -25,7 +25,7 @@ $errors = array();
 
 // Only allow site admins to edit every user.
 if( is_site_admin() == false ) 
-	if( $user_id != $current_user->ID ) $errors['head'] = __('You do not have permission to edit this user.');
+	if( $user_id != $current_user->ID ) $errors = new WP_Error('head', __('You do not have permission to edit this user.'));
 
 switch ($action) {
 case 'switchposts':
@@ -38,16 +38,14 @@ break;
 
 case 'update':
 
-check_admin_referer();
-
-$errors = array();
+check_admin_referer('update-user_' . $user_id);
 
-if (!current_user_can('edit_users'))
-	$errors['head'] = __('You do not have permission to edit this user.');
+if ( !current_user_can('edit_user', $user_id) )
+	$errors = new WP_Error('head', __('You do not have permission to edit this user.'));
 else
-	$errors = edit_user($user_id);
+	if( isset( $errors ) == false ) $errors = edit_user($user_id);
 
-if(count($errors) == 0) {
+if( !is_wp_error( $errors ) ) {
 	if( is_site_admin() )
 		update_usermeta( $user_id, 'invites_left', intval( $_POST[ 'invites_left' ] ) );
 	header("Location: user-edit.php?user_id=$user_id&updated=true");
@@ -59,7 +57,9 @@ include ('admin-header.php');
 
 $profileuser = new WP_User($user_id);
 
-if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permission to edit this user.');
+if ( !current_user_can('edit_user', $user_id) )
+	if ( !is_wp_error( $errors ) )
+		$errors = new WP_Error('head', __('You do not have permission to edit this user.'));
 ?>
 
 <?php if ( isset($_GET['updated']) ) : ?>
@@ -67,11 +67,12 @@ if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permi
 	<p><strong><?php _e('User updated.') ?></strong></p>
 </div>
 <?php endif; ?>
-<?php if ( count($errors) != 0 ) { ?>
+<?php if ( is_wp_error( $errors ) ) { ?>
 <div class="error">
 	<ul>
 	<?php
-	foreach($errors as $error) echo "<li>$error</li>";
+	foreach( $errors->get_error_messages() as $message )
+		echo "<li>$message</li>";
 	?>
 	</ul>
 </div>
@@ -81,6 +82,7 @@ if (!current_user_can('edit_users')) $errors['head'] = __('You do not have permi
 <h2><?php _e('Edit User'); ?></h2>
 
 <form name="profile" id="your-profile" action="user-edit.php" method="post">
+<?php wp_nonce_field('update-user_' . $user_id) ?>
 <p>
 <input type="hidden" name="from" value="profile" />
 <input type="hidden" name="checkuser_id" value="<?php echo $user_ID ?>" />