diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-04 16:44:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-04 16:44:15 +0000 |
| commit | 7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc (patch) | |
| tree | c6fd23b598f3994eddb18cb1c0f2e8d95ff054fa /wp-includes/capabilities.php | |
| parent | f650f48c048bfbbb2ae702b6425d87e39358d748 (diff) | |
| download | wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.gz wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.xz wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.zip | |
Merged with WordPress 2.5, unstable, only for testing
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/capabilities.php')
| -rw-r--r-- | wp-includes/capabilities.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php index 3c3594d..85eaa77 100644 --- 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); |