vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-04-03 20:24:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use the wpdb method instead of $wpdb->prefix.

Browse Source 
props hakre.
fixes #16756.


git-svn-id: https://develop.svn.wordpress.org/trunk@25615 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin
2013-09-24 23:40:41 +00:00
parent a580e9f3c3
commit f7050daeba
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/wp-includes/user.php
View File

@@ -248,8 +248,9 @@ function get_user_option( $option, $user = 0, $deprecated = '' ) {
if ( ! $user = get_userdata( $user ) )
return false;
if ( $user->has_prop( $wpdb->prefix . $option ) ) // Blog specific
$result = $user->get( $wpdb->prefix . $option );
$prefix = $wpdb->get_blog_prefix();
if ( $user->has_prop( $prefix . $option ) ) // Blog specific
$result = $user->get( $prefix . $option );
elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
$result = $user->get( $option );
else
@@ -280,7 +281,7 @@ function update_user_option( $user_id, $option_name, $newvalue, $global = false
global $wpdb;
if ( !$global )
$option_name = $wpdb->prefix . $option_name;
$option_name = $wpdb->get_blog_prefix() . $option_name;
return update_user_meta( $user_id, $option_name, $newvalue );
}
@@ -304,7 +305,7 @@ function delete_user_option( $user_id, $option_name, $global = false ) {
global $wpdb;
if ( !$global )
$option_name = $wpdb->prefix . $option_name;
$option_name = $wpdb->get_blog_prefix() . $option_name;
return delete_user_meta( $user_id, $option_name );
}