summaryrefslogtreecommitdiffstats
path: root/wp-includes/capabilities.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-30 17:46:07 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-30 17:46:07 +0000
commit006898584b668bc04aeff31f8180d048e6ca4071 (patch)
tree760b44188ab02261ba351de90e216e1b419fa87c /wp-includes/capabilities.php
parenteeae9d5c09399fa7cb89fe52d5676bf18fa61457 (diff)
downloadwordpress-mu-006898584b668bc04aeff31f8180d048e6ca4071.tar.gz
wordpress-mu-006898584b668bc04aeff31f8180d048e6ca4071.tar.xz
wordpress-mu-006898584b668bc04aeff31f8180d048e6ca4071.zip
WP Merge to rev 3834 and reverted to novalueindb option code
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@873 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/capabilities.php')
-rw-r--r--wp-includes/capabilities.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-includes/capabilities.php b/wp-includes/capabilities.php
index 273dccc..eccde97 100644
--- a/wp-includes/capabilities.php
+++ b/wp-includes/capabilities.php
@@ -55,7 +55,7 @@ class WP_Roles {
unset($this->role_objects[$role]);
unset($this->role_names[$role]);
unset($this->roles[$role]);
-
+
if ( $this->use_db )
update_option($this->role_key, $this->roles);
}
@@ -427,7 +427,7 @@ function map_meta_cap($cap, $user_id) {
}
$author_data = get_userdata($user_id);
- $page_author_data = get_userdata($post->post_author);
+ $page_author_data = get_userdata($page->post_author);
if ($user_id == $page_author_data->ID)
$caps[] = 'read';
else