<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[13387] trunk/wp-includes: database code cleanup, See #12362</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13387">13387</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-02-24 21:30:13 +0000 (Wed, 24 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>database code cleanup, See <a href="http://trac.wordpress.org/ticket/12362">#12362</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (13386 => 13387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-02-24 21:07:23 UTC (rev 13386)
+++ trunk/wp-includes/ms-settings.php 2010-02-24 21:30:13 UTC (rev 13387)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-$wpdb->set_prefix( $table_prefix ); // set up blog tables
</del><ins>+$wpdb->set_prefix( $table_prefix, false ); // set DB table prefix
</ins><span class="cx"> $wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
</span><span class="cx"> $table_prefix = $wpdb->get_blog_prefix();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (13386 => 13387)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-02-24 21:07:23 UTC (rev 13386)
+++ trunk/wp-includes/wp-db.php 2010-02-24 21:30:13 UTC (rev 13387)
</span><span class="lines">@@ -548,7 +548,7 @@
</span><span class="cx"> * @param string $prefix Alphanumeric name for the new prefix.
</span><span class="cx"> * @return string|WP_Error Old prefix or WP_Error on error
</span><span class="cx"> */
</span><del>- function set_prefix( $prefix ) {
</del><ins>+ function set_prefix( $prefix, $set_table_names = true ) {
</ins><span class="cx">
</span><span class="cx"> if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
</span><span class="cx"> return new WP_Error('invalid_db_prefix', /*WP_I18N_DB_BAD_PREFIX*/'Invalid database prefix'/*/WP_I18N_DB_BAD_PREFIX*/);
</span><span class="lines">@@ -560,20 +560,21 @@
</span><span class="cx">
</span><span class="cx"> $this->base_prefix = $prefix;
</span><span class="cx">
</span><del>- foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
- $this->$table = $prefixed_table;
</del><ins>+ if ( $set_table_names ) {
+ foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
+ $this->$table = $prefixed_table;
</ins><span class="cx">
</span><del>- if ( defined( 'VHOST' ) && empty( $this->blogid ) )
- return $old_prefix;
</del><ins>+ if ( defined( 'VHOST' ) && empty( $this->blogid ) )
+ return $old_prefix;
</ins><span class="cx">
</span><del>- $this->prefix = $this->get_blog_prefix( $this->blogid );
</del><ins>+ $this->prefix = $this->get_blog_prefix( $this->blogid );
</ins><span class="cx">
</span><del>- foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
- $this->$table = $prefixed_table;
</del><ins>+ foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
+ $this->$table = $prefixed_table;
</ins><span class="cx">
</span><del>- foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
- $this->$table = $prefixed_table;
-
</del><ins>+ foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
+ $this->$table = $prefixed_table;
+ }
</ins><span class="cx"> return $old_prefix;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>