Wordpress 2.5.1

[autoinstalls/wordpress.git] / wp-includes / capabilities.php

diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 3c3594d1c54c76afde366b883ea9084744e8958d..85eaa7735eb696f89e4cc0df71a415fb0eee3e60 100644 (file)
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -138,7 +138,6 @@ class WP_User {
        var $allcaps = array();
 
        function WP_User($id, $name = '') {
-               global $wpdb;
 
                if ( empty($id) && empty($name) )
                        return;
@@ -291,7 +290,9 @@ function map_meta_cap($cap, $user_id) {
                $caps[] = 'delete_users';
                break;
        case 'edit_user':
-               $caps[] = 'edit_users';
+               if ( !isset($args[0]) || $user_id != $args[0] ) {
+                       $caps[] = 'edit_users';
+               }
                break;
        case 'delete_post':
                $author_data = get_userdata($user_id);