vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-01 15:50:09 +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

8
wp-admin/admin-ajax.php
View File

@@ -998,11 +998,11 @@ case 'closed-postboxes' :
die('-1');
if ( is_array($closed) )
update_usermeta($user->ID, 'closedpostboxes_'.$page, $closed);
update_user_meta($user->ID, 'closedpostboxes_'.$page, $closed);
if ( is_array($hidden) ) {
$hidden = array_diff( $hidden, array('submitdiv', 'linksubmitdiv') ); // postboxes that are always shown
update_usermeta($user->ID, 'meta-box-hidden_'.$page, $hidden);
update_user_meta($user->ID, 'meta-box-hidden_'.$page, $hidden);
}
die('1');
@@ -1020,7 +1020,7 @@ case 'hidden-columns' :
die('-1');
if ( is_array($hidden) )
update_usermeta($user->ID, "manage-$page-columns-hidden", $hidden);
update_user_meta($user->ID, "manage-$page-columns-hidden", $hidden);
die('1');
break;
@@ -1040,7 +1040,7 @@ case 'meta-box-order':
update_user_option($user->ID, "meta-box-order_$page", $order);
if ( $page_columns )
update_usermeta($user->ID, "screen_layout_$page", $page_columns);
update_user_meta($user->ID, "screen_layout_$page", $page_columns);
die('1');
break;

8
wp-admin/import/dotclear.php
View File

@@ -257,10 +257,10 @@ class Dotclear_Import {
else if (2 <= $wp_perms) { $user->set_role('contributor'); }
else { $user->set_role('subscriber'); }
update_usermeta( $ret_id, 'wp_user_level', $wp_perms);
update_usermeta( $ret_id, 'rich_editing', 'false');
update_usermeta( $ret_id, 'first_name', csc ($user_prenom));
update_usermeta( $ret_id, 'last_name', csc ($user_nom));
update_user_meta( $ret_id, 'wp_user_level', $wp_perms);
update_user_meta( $ret_id, 'rich_editing', 'false');
update_user_meta( $ret_id, 'first_name', csc ($user_prenom));
update_user_meta( $ret_id, 'last_name', csc ($user_nom));
}// End foreach($users as $user)
// Store id translation array for future use

4
wp-admin/import/textpattern.php
View File

@@ -265,8 +265,8 @@ class Textpattern_Import {
if('2' == $transperms[$privs]) { $user->set_role('contributor'); }
if('0' == $transperms[$privs]) { $user->set_role('subscriber'); }
update_usermeta( $ret_id, 'wp_user_level', $transperms[$privs] );
update_usermeta( $ret_id, 'rich_editing', 'false');
update_user_meta( $ret_id, 'wp_user_level', $transperms[$privs] );
update_user_meta( $ret_id, 'rich_editing', 'false');
}// End foreach($users as $user)
// Store id translation array for future use

2
wp-admin/includes/misc.php
View File

@@ -424,7 +424,7 @@ function set_screen_options() {
break;
}
update_usermeta($user->ID, $option, $value);
update_user_meta($user->ID, $option, $value);
wp_redirect( remove_query_arg( array('pagenum', 'apage', 'paged'), wp_get_referer() ) );
exit;
}

12
wp-admin/includes/ms.php
View File

@@ -543,12 +543,12 @@ function redirect_user_to_blog() {
if ( !empty( $blogs ) ) {
foreach( $blogs as $blogid => $blog ) {
if ( $blogid != $dashboard_blog->blog_id && get_usermeta( $current_user->ID , 'primary_blog' ) == $dashboard_blog->blog_id ) {
update_usermeta( $current_user->ID, 'primary_blog', $blogid );
if ( $blogid != $dashboard_blog->blog_id && get_user_meta( $current_user->ID , 'primary_blog' ) == $dashboard_blog->blog_id ) {
update_user_meta( $current_user->ID, 'primary_blog', $blogid );
continue;
}
}
$blog = get_blog_details( get_usermeta( $current_user->ID , 'primary_blog' ) );
$blog = get_blog_details( get_user_meta( $current_user->ID , 'primary_blog' ) );
$protocol = ( is_ssl() ? 'https://' : 'http://' );
wp_redirect( $protocol . $blog->domain . $blog->path . 'wp-admin/?c=' . $c ); // redirect and count to 5, "just in case"
exit;
@@ -690,7 +690,7 @@ function choose_primary_blog() {
<td>
<?php
$all_blogs = get_blogs_of_user( $current_user->ID );
$primary_blog = get_usermeta($current_user->ID, 'primary_blog');
$primary_blog = get_user_meta($current_user->ID, 'primary_blog');
if ( count( $all_blogs ) > 1 ) {
$found = false;
?>
@@ -704,13 +704,13 @@ function choose_primary_blog() {
<?php
if ( !$found ) {
$blog = array_shift( $all_blogs );
update_usermeta( $current_user->ID, 'primary_blog', $blog->userblog_id );
update_user_meta( $current_user->ID, 'primary_blog', $blog->userblog_id );
}
} elseif ( count( $all_blogs ) == 1 ) {
$blog = array_shift( $all_blogs );
echo $blog->domain;
if ( $primary_blog != $blog->userblog_id ) // Set the primary blog again if it's out of sync with blog list.
update_usermeta( $current_user->ID, 'primary_blog', $blog->userblog_id );
update_user_meta( $current_user->ID, 'primary_blog', $blog->userblog_id );
} else {
echo "N/A";
}

4
wp-admin/includes/schema.php
View File

@@ -721,8 +721,8 @@ Thanks!
if ( !is_multisite() ) {
$wpdb->insert( $wpdb->blogs, array( 'site_id' => $network_id, 'domain' => $domain, 'path' => $path ) );
$blog_id = $wpdb->insert_id;
update_usermeta( $site_user->ID, 'source_domain', $domain );
update_usermeta( $site_user->ID, 'primary_blog', $blog_id );
update_user_meta( $site_user->ID, 'source_domain', $domain );
update_user_meta( $site_user->ID, 'primary_blog', $blog_id );
}
if ( $vhost == 'yes' )

24
wp-admin/includes/upgrade.php
View File

@@ -671,23 +671,23 @@ function upgrade_160() {
$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
foreach ( $users as $user ) :
if ( !empty( $user->user_firstname ) )
update_usermeta( $user->ID, 'first_name', $wpdb->escape($user->user_firstname) );
update_user_meta( $user->ID, 'first_name', $wpdb->escape($user->user_firstname) );
if ( !empty( $user->user_lastname ) )
update_usermeta( $user->ID, 'last_name', $wpdb->escape($user->user_lastname) );
update_user_meta( $user->ID, 'last_name', $wpdb->escape($user->user_lastname) );
if ( !empty( $user->user_nickname ) )
update_usermeta( $user->ID, 'nickname', $wpdb->escape($user->user_nickname) );
update_user_meta( $user->ID, 'nickname', $wpdb->escape($user->user_nickname) );
if ( !empty( $user->user_level ) )
update_usermeta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
update_user_meta( $user->ID, $wpdb->prefix . 'user_level', $user->user_level );
if ( !empty( $user->user_icq ) )
update_usermeta( $user->ID, 'icq', $wpdb->escape($user->user_icq) );
update_user_meta( $user->ID, 'icq', $wpdb->escape($user->user_icq) );
if ( !empty( $user->user_aim ) )
update_usermeta( $user->ID, 'aim', $wpdb->escape($user->user_aim) );
update_user_meta( $user->ID, 'aim', $wpdb->escape($user->user_aim) );
if ( !empty( $user->user_msn ) )
update_usermeta( $user->ID, 'msn', $wpdb->escape($user->user_msn) );
update_user_meta( $user->ID, 'msn', $wpdb->escape($user->user_msn) );
if ( !empty( $user->user_yim ) )
update_usermeta( $user->ID, 'yim', $wpdb->escape($user->user_icq) );
update_user_meta( $user->ID, 'yim', $wpdb->escape($user->user_icq) );
if ( !empty( $user->user_description ) )
update_usermeta( $user->ID, 'description', $wpdb->escape($user->user_description) );
update_user_meta( $user->ID, 'description', $wpdb->escape($user->user_description) );
if ( isset( $user->user_idmode ) ):
$idmode = $user->user_idmode;
@@ -702,11 +702,11 @@ function upgrade_160() {
endif;
// FIXME: RESET_CAPS is temporary code to reset roles and caps if flag is set.
$caps = get_usermeta( $user->ID, $wpdb->prefix . 'capabilities');
$caps = get_user_meta( $user->ID, $wpdb->prefix . 'capabilities');
if ( empty($caps) || defined('RESET_CAPS') ) {
$level = get_usermeta($user->ID, $wpdb->prefix . 'user_level');
$level = get_user_meta($user->ID, $wpdb->prefix . 'user_level');
$role = translate_level_to_role($level);
update_usermeta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
update_user_meta( $user->ID, $wpdb->prefix . 'capabilities', array($role => true) );
}
endforeach;

2
wp-admin/ms-edit.php
View File

@@ -96,7 +96,7 @@ switch ( $_GET['action'] ) {
foreach ( (array)$move_users as $user_id ) {
remove_user_from_blog($user_id, get_site_option( 'dashboard_blog' ) );
add_user_to_blog( $dashboard_blog_id, $user_id, get_site_option( 'default_user_role', 'subscriber' ) );
update_usermeta( $user_id, 'primary_blog', $dashboard_blog_id );
update_user_meta( $user_id, 'primary_blog', $dashboard_blog_id );
}
}
}

2
wp-admin/plugins.php
View File

@@ -30,7 +30,7 @@ $status = isset($_REQUEST['plugin_status']) ? $_REQUEST['plugin_status'] : $defa
if ( !in_array($status, array('all', 'active', 'inactive', 'recent', 'upgrade', 'network', 'mustuse', 'dropins', 'search')) )
$status = 'all';
if ( $status != $default_status && 'search' != $status )
update_usermeta($current_user->ID, 'plugins_last_view', $status);
update_user_meta($current_user->ID, 'plugins_last_view', $status);
$page = isset($_REQUEST['paged']) ? $_REQUEST['paged'] : 1;

2
wp-admin/user-edit.php
View File

@@ -123,7 +123,7 @@ if ( !is_multisite() ) {
if ( !isset( $errors ) || ( isset( $errors ) && is_object( $errors ) && false == $errors->get_error_codes() ) )
$errors = edit_user($user_id);
if ( $delete_role ) // stops users being added to current blog when they are edited
update_usermeta( $user_id, $blog_prefix . 'capabilities' , '' );
update_user_meta( $user_id, $blog_prefix . 'capabilities' , '' );
}
if ( !is_wp_error( $errors ) ) {