vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-06-28 14:20:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use deprecated *_usermeta() functions. Props technosailor fixes #10837

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@13311 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2010-02-22 21:25:32 +00:00
parent b1ee08dcbe
commit 670b8d8bfb
14 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
wp-includes/capabilities.php
View File

@@ -567,7 +567,7 @@ class WP_User {
*/
function add_role( $role ) {
$this->caps[$role] = true;
update_usermeta( $this->ID, $this->cap_key, $this->caps );
update_user_meta( $this->ID, $this->cap_key, $this->caps );
$this->get_role_caps();
$this->update_user_level_from_caps();
}
@@ -584,7 +584,7 @@ class WP_User {
if ( empty( $this->roles[$role] ) || ( count( $this->roles ) <= 1 ) )
return;
unset( $this->caps[$role] );
update_usermeta( $this->ID, $this->cap_key, $this->caps );
update_user_meta( $this->ID, $this->cap_key, $this->caps );
$this->get_role_caps();
}
@@ -609,7 +609,7 @@ class WP_User {
} else {
$this->roles = false;
}
update_usermeta( $this->ID, $this->cap_key, $this->caps );
update_user_meta( $this->ID, $this->cap_key, $this->caps );
$this->get_role_caps();
$this->update_user_level_from_caps();
do_action( 'set_user_role', $this->ID, $role );
@@ -656,7 +656,7 @@ class WP_User {
function update_user_level_from_caps() {
global $wpdb;
$this->user_level = array_reduce( array_keys( $this->allcaps ), array( &$this, 'level_reduction' ), 0 );
update_usermeta( $this->ID, $wpdb->prefix . 'user_level', $this->user_level );
update_user_meta( $this->ID, $wpdb->prefix . 'user_level', $this->user_level );
}
/**
@@ -670,7 +670,7 @@ class WP_User {
*/
function add_cap( $cap, $grant = true ) {
$this->caps[$cap] = $grant;
update_usermeta( $this->ID, $this->cap_key, $this->caps );
update_user_meta( $this->ID, $this->cap_key, $this->caps );
}
/**
@@ -685,7 +685,7 @@ class WP_User {
if ( empty( $this->caps[$cap] ) )
return;
unset( $this->caps[$cap] );
update_usermeta( $this->ID, $this->cap_key, $this->caps );
update_user_meta( $this->ID, $this->cap_key, $this->caps );
}
/**
@@ -697,8 +697,8 @@ class WP_User {
function remove_all_caps() {
global $wpdb;
$this->caps = array();
update_usermeta( $this->ID, $this->cap_key, '' );
update_usermeta( $this->ID, $wpdb->prefix . 'user_level', '' );
update_user_meta( $this->ID, $this->cap_key, '' );
update_user_meta( $this->ID, $wpdb->prefix . 'user_level', '' );
$this->get_role_caps();
}

40
wp-includes/ms-functions.php
View File

@@ -77,25 +77,25 @@ function get_active_blog_for_user( $user_id ) { // get an active blog for user -
if ( empty( $blogs ) ) {
$details = get_dashboard_blog();
add_user_to_blog( $details->blog_id, $user_id, 'subscriber' );
update_usermeta( $user_id, 'primary_blog', $details->blog_id );
update_user_meta( $user_id, 'primary_blog', $details->blog_id );
wp_cache_delete( $user_id, 'users' );
return $details;
}
$primary_blog = get_usermeta( $user_id, "primary_blog" );
$primary_blog = get_user_meta( $user_id, "primary_blog" );
$details = get_dashboard_blog();
if ( $primary_blog ) {
$blogs = get_blogs_of_user( $user_id );
if ( isset( $blogs[ $primary_blog ] ) == false ) {
add_user_to_blog( $details->blog_id, $user_id, 'subscriber' );
update_usermeta( $user_id, 'primary_blog', $details->blog_id );
update_user_meta( $user_id, 'primary_blog', $details->blog_id );
wp_cache_delete( $user_id, 'users' );
} else {
$details = get_blog_details( $primary_blog );
}
} else {
add_user_to_blog( $details->blog_id, $user_id, 'subscriber' ); // Add subscriber permission for dashboard blog
update_usermeta( $user_id, 'primary_blog', $details->blog_id );
update_user_meta( $user_id, 'primary_blog', $details->blog_id );
}
if ( ( is_object( $details ) == false ) || ( is_object( $details ) && $details->archived == 1 || $details->spam == 1 || $details->deleted == 1 ) ) {
@@ -109,12 +109,12 @@ function get_active_blog_for_user( $user_id ) { // get an active blog for user -
if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
$ret = $blog;
$changed = false;
if ( get_usermeta( $user_id , 'primary_blog' ) != $blog_id ) {
update_usermeta( $user_id, 'primary_blog', $blog_id );
if ( get_user_meta( $user_id , 'primary_blog' ) != $blog_id ) {
update_user_meta( $user_id, 'primary_blog', $blog_id );
$changed = true;
}
if ( !get_usermeta($user_id , 'source_domain') ) {
update_usermeta( $user_id, 'source_domain', $blog->domain );
if ( !get_user_meta($user_id , 'source_domain') ) {
update_user_meta( $user_id, 'source_domain', $blog->domain );
$changed = true;
}
if ( $changed )
@@ -126,7 +126,7 @@ function get_active_blog_for_user( $user_id ) { // get an active blog for user -
// Should never get here
$dashboard_blog = get_dashboard_blog();
add_user_to_blog( $dashboard_blog->blog_id, $user_id, 'subscriber' ); // Add subscriber permission for dashboard blog
update_usermeta( $user_id, 'primary_blog', $dashboard_blog->blog_id );
update_user_meta( $user_id, 'primary_blog', $dashboard_blog->blog_id );
return $dashboard_blog;
}
return $ret;
@@ -248,10 +248,10 @@ function add_user_to_blog( $blog_id, $user_id, $role ) {
if ( empty($user) )
return new WP_Error('user_does_not_exist', __('That user does not exist.'));
if ( !get_usermeta($user_id, 'primary_blog') ) {
update_usermeta($user_id, 'primary_blog', $blog_id);
if ( !get_user_meta($user_id, 'primary_blog') ) {
update_user_meta($user_id, 'primary_blog', $blog_id);
$details = get_blog_details($blog_id);
update_usermeta($user_id, 'source_domain', $details->domain);
update_user_meta($user_id, 'source_domain', $details->domain);
}
$user->set_role($role);
@@ -270,7 +270,7 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
// If being removed from the primary blog, set a new primary if the user is assigned
// to multiple blogs.
$primary_blog = get_usermeta($user_id, 'primary_blog');
$primary_blog = get_user_meta($user_id, 'primary_blog');
if ( $primary_blog == $blog_id ) {
$new_id = '';
$new_domain = '';
@@ -283,8 +283,8 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
break;
}
update_usermeta($user_id, 'primary_blog', $new_id);
update_usermeta($user_id, 'source_domain', $new_domain);
update_user_meta($user_id, 'primary_blog', $new_id);
update_user_meta($user_id, 'source_domain', $new_domain);
}
// wp_revoke_user($user_id);
@@ -293,8 +293,8 @@ function remove_user_from_blog($user_id, $blog_id = '', $reassign = '') {
$blogs = get_blogs_of_user($user_id);
if ( count($blogs) == 0 ) {
update_usermeta($user_id, 'primary_blog', '');
update_usermeta($user_id, 'source_domain', '');
update_user_meta($user_id, 'primary_blog', '');
update_user_meta($user_id, 'source_domain', '');
}
if ( $reassign != '' ) {
@@ -826,8 +826,8 @@ function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id
add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
update_option( 'blog_public', $meta['public'] );
if ( !is_super_admin() && get_usermeta( $user_id, 'primary_blog' ) == get_site_option( 'dashboard_blog', 1 ) )
update_usermeta( $user_id, 'primary_blog', $blog_id );
if ( !is_super_admin() && get_user_meta( $user_id, 'primary_blog' ) == get_site_option( 'dashboard_blog', 1 ) )
update_user_meta( $user_id, 'primary_blog', $blog_id );
restore_current_blog();
do_action( 'wpmu_new_blog', $blog_id, $user_id );
@@ -1306,7 +1306,7 @@ function add_new_user_to_blog( $user_id, $email, $meta ) {
$role = $meta[ 'new_role' ];
remove_user_from_blog($user_id, $current_site->blogid); // remove user from main blog.
add_user_to_blog( $blog_id, $user_id, $role );
update_usermeta( $user_id, 'primary_blog', $blog_id );
update_user_meta( $user_id, 'primary_blog', $blog_id );
}
}

18
wp-includes/registration.php
View File

@@ -202,20 +202,20 @@ function wp_insert_user($userdata) {
$user_id = (int) $wpdb->insert_id;
}
update_usermeta( $user_id, 'first_name', $first_name);
update_usermeta( $user_id, 'last_name', $last_name);
update_usermeta( $user_id, 'nickname', $nickname );
update_usermeta( $user_id, 'description', $description );
update_usermeta( $user_id, 'rich_editing', $rich_editing);
update_usermeta( $user_id, 'comment_shortcuts', $comment_shortcuts);
update_usermeta( $user_id, 'admin_color', $admin_color);
update_usermeta( $user_id, 'use_ssl', $use_ssl);
update_user_meta( $user_id, 'first_name', $first_name);
update_user_meta( $user_id, 'last_name', $last_name);
update_user_meta( $user_id, 'nickname', $nickname );
update_user_meta( $user_id, 'description', $description );
update_user_meta( $user_id, 'rich_editing', $rich_editing);
update_user_meta( $user_id, 'comment_shortcuts', $comment_shortcuts);
update_user_meta( $user_id, 'admin_color', $admin_color);
update_user_meta( $user_id, 'use_ssl', $use_ssl);
foreach ( _wp_get_user_contactmethods() as $method => $name ) {
if ( empty($$method) )
$$method = '';
update_usermeta( $user_id, $method, $$method );
update_user_meta( $user_id, $method, $$method );
}
if ( isset($role) ) {

2
wp-includes/user.php
View File

@@ -267,7 +267,7 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false
global $wpdb;
if ( !$global )
$option_name = $wpdb->prefix . $option_name;
return update_usermeta( $user_id, $option_name, $newvalue );
return update_user_meta( $user_id, $option_name, $newvalue );
}
/**