HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cap migration.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@2712 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan
2005-07-15 01:24:08 +00:00
parent 27174a151b
commit 2f6ae330c0
5 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
wp-includes/capabilities.php
View File

@@ -102,16 +102,25 @@ class WP_Role {
class WP_User {
var $data;
var $id;
var $caps;
var $id = 0;
var $caps = array();
var $cap_key;
var $roles;
var $allcaps;
var $roles = array();
var $allcaps = array();
function WP_User($id) {
global $wp_roles, $table_prefix;
$this->id = $id;
$this->data = get_userdata($id);
if ( is_numeric($id) ) {
$this->data = get_userdata($id);
} else {
$this->data = get_userdatabylogin($id);
}
if ( empty($this->data->ID) )
return;
$this->id = $this->data->ID;
$this->cap_key = $table_prefix . 'capabilities';
$this->caps = &$this->data->{$this->cap_key};
$this->get_role_caps();
@@ -140,8 +149,9 @@ class WP_User {
}
function remove_role($role) {
if(!empty($this->roles[$role]) && (count($this->roles) > 1))
unset($this->caps[$cap]);
if ( empty($this->roles[$role]) || (count($this->roles) <= 1) )
return;
unset($this->caps[$role]);
update_usermeta($this->id, $this->cap_key, $this->caps);
$this->get_role_caps();
}
@@ -177,7 +187,7 @@ class WP_User {
}
function remove_cap($cap) {
if(!empty($this->roles[$role])) return;
if ( empty($this->roles[$cap]) ) return;
unset($this->caps[$cap]);
update_usermeta($this->id, $this->cap_key, $this->caps);
}

3
wp-includes/functions-post.php
View File

@@ -532,6 +532,7 @@ function wp_new_comment( $commentdata, $spam = false ) {
if ( $user_id ) {
$userdata = get_userdata($user_id);
$user = new WP_User($user_id);
$post_author = $wpdb->get_var("SELECT post_author FROM $wpdb->posts WHERE ID = '$comment_post_ID' LIMIT 1");
}
@@ -552,7 +553,7 @@ function wp_new_comment( $commentdata, $spam = false ) {
}
}
if ( $userdata && ( $user_id == $post_author || $userdata->user_level >= 9 ) ) {
if ( $userdata && ( $user_id == $post_author || $user->has_cap('level_9') ) ) {
$approved = 1;
} else {
if ( check_comment($author, $email, $url, $comment, $user_ip, $user_agent, $comment_type) )

3
wp-includes/registration-functions.php
View File

@@ -26,6 +26,9 @@ function create_user( $username, $password, $email, $user_level ) {
$user_level = (int) $user_level;
update_usermeta( $user_id, $wpdb->prefix . 'user_level', $user_level);
$user = new WP_User($user_id);
$user->set_role(get_settings('default_role'));
return $user_id;
}