<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[25615] trunk/src/wp-includes: Use the wpdb method instead of $wpdb->prefix.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/25615">25615</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2013-09-24 23:40:41 +0000 (Tue, 24 Sep 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the wpdb method instead of $wpdb->prefix.
props hakre.
fixes <a href="http://core.trac.wordpress.org/ticket/16756">#16756</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescapabilitiesphp">trunk/src/wp-includes/capabilities.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescapabilitiesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/capabilities.php (25614 => 25615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/capabilities.php 2013-09-24 23:06:18 UTC (rev 25614)
+++ trunk/src/wp-includes/capabilities.php 2013-09-24 23:40:41 UTC (rev 25615)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> */
</span><span class="cx"> function _init () {
</span><span class="cx"> global $wpdb, $wp_user_roles;
</span><del>- $this->role_key = $wpdb->prefix . 'user_roles';
</del><ins>+ $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
</ins><span class="cx"> if ( ! empty( $wp_user_roles ) ) {
</span><span class="cx"> $this->roles = $wp_user_roles;
</span><span class="cx"> $this->use_db = false;
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> global $wpdb, $wp_user_roles;
</span><span class="cx">
</span><span class="cx"> // Duplicated from _init() to avoid an extra function call.
</span><del>- $this->role_key = $wpdb->prefix . 'user_roles';
</del><ins>+ $this->role_key = $wpdb->get_blog_prefix() . 'user_roles';
</ins><span class="cx"> $this->roles = get_option( $this->role_key );
</span><span class="cx"> if ( empty( $this->roles ) )
</span><span class="cx"> return;
</span><span class="lines">@@ -709,7 +709,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( empty($cap_key) )
</span><del>- $this->cap_key = $wpdb->prefix . 'capabilities';
</del><ins>+ $this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
</ins><span class="cx"> else
</span><span class="cx"> $this->cap_key = $cap_key;
</span><span class="cx">
</span><span class="lines">@@ -859,7 +859,7 @@
</span><span class="cx"> function update_user_level_from_caps() {
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 );
</span><del>- update_user_meta( $this->ID, $wpdb->prefix . 'user_level', $this->user_level );
</del><ins>+ update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx"> $this->caps = array();
</span><span class="cx"> delete_user_meta( $this->ID, $this->cap_key );
</span><del>- delete_user_meta( $this->ID, $wpdb->prefix . 'user_level' );
</del><ins>+ delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
</ins><span class="cx"> $this->get_role_caps();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunksrcwpincludesmsblogsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/ms-blogs.php (25614 => 25615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/ms-blogs.php 2013-09-24 23:06:18 UTC (rev 25614)
+++ trunk/src/wp-includes/ms-blogs.php 2013-09-24 23:40:41 UTC (rev 25615)
</span><span class="lines">@@ -498,7 +498,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $wpdb->set_blog_id( $new_blog );
</span><del>- $GLOBALS['table_prefix'] = $wpdb->prefix;
</del><ins>+ $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
</ins><span class="cx"> $prev_blog_id = $GLOBALS['blog_id'];
</span><span class="cx"> $GLOBALS['blog_id'] = $new_blog;
</span><span class="cx">
</span><span class="lines">@@ -561,7 +561,7 @@
</span><span class="cx"> $wpdb->set_blog_id( $blog );
</span><span class="cx"> $prev_blog_id = $GLOBALS['blog_id'];
</span><span class="cx"> $GLOBALS['blog_id'] = $blog;
</span><del>- $GLOBALS['table_prefix'] = $wpdb->prefix;
</del><ins>+ $GLOBALS['table_prefix'] = $wpdb->get_blog_prefix();
</ins><span class="cx">
</span><span class="cx"> if ( function_exists( 'wp_cache_switch_to_blog' ) ) {
</span><span class="cx"> wp_cache_switch_to_blog( $blog );
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/user.php (25614 => 25615)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/user.php 2013-09-24 23:06:18 UTC (rev 25614)
+++ trunk/src/wp-includes/user.php 2013-09-24 23:40:41 UTC (rev 25615)
</span><span class="lines">@@ -248,8 +248,9 @@
</span><span class="cx"> if ( ! $user = get_userdata( $user ) )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if ( $user->has_prop( $wpdb->prefix . $option ) ) // Blog specific
- $result = $user->get( $wpdb->prefix . $option );
</del><ins>+ $prefix = $wpdb->get_blog_prefix();
+ if ( $user->has_prop( $prefix . $option ) ) // Blog specific
+ $result = $user->get( $prefix . $option );
</ins><span class="cx"> elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
</span><span class="cx"> $result = $user->get( $option );
</span><span class="cx"> else
</span><span class="lines">@@ -280,7 +281,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !$global )
</span><del>- $option_name = $wpdb->prefix . $option_name;
</del><ins>+ $option_name = $wpdb->get_blog_prefix() . $option_name;
</ins><span class="cx">
</span><span class="cx"> return update_user_meta( $user_id, $option_name, $newvalue );
</span><span class="cx"> }
</span><span class="lines">@@ -304,7 +305,7 @@
</span><span class="cx"> global $wpdb;
</span><span class="cx">
</span><span class="cx"> if ( !$global )
</span><del>- $option_name = $wpdb->prefix . $option_name;
</del><ins>+ $option_name = $wpdb->get_blog_prefix() . $option_name;
</ins><span class="cx"> return delete_user_meta( $user_id, $option_name );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>