<!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>[13337] trunk:
Ensure we have MS global tables defined during network install.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13337">13337</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-02-23 19:58:53 +0000 (Tue, 23 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Ensure we have MS global tables defined during network install. See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.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="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13336 => 13337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-02-23 19:28:41 UTC (rev 13336)
+++ trunk/wp-admin/network.php 2010-02-23 19:58:53 UTC (rev 13337)
</span><span class="lines">@@ -16,6 +16,10 @@
</span><span class="cx"> if ( ! is_super_admin() )
</span><span class="cx"> wp_die( __( 'You do not have sufficient permissions to manage options for this blog.' ) );
</span><span class="cx">
</span><ins>+// We need to create references to ms global tables to enable Network.
+foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
+ $wpdb->$table = $prefixed_table;
+
</ins><span class="cx"> $title = __( 'Network Settings' );
</span><span class="cx"> $parent_file = 'tools.php';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (13336 => 13337)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php 2010-02-23 19:28:41 UTC (rev 13336)
+++ trunk/wp-includes/wp-db.php 2010-02-23 19:58:53 UTC (rev 13337)
</span><span class="lines">@@ -625,13 +625,12 @@
</span><span class="cx"> * @uses wpdb::ms_global_tables
</span><span class="cx"> * @uses is_multisite()
</span><span class="cx"> *
</span><del>- * @param string $scope Can be all, global, blog, or old tables. Default all.
</del><ins>+ * @param string $scope Can be all, global, ms_global, blog, or old tables. Default all.
</ins><span class="cx"> * All returns the blog tables for the queried blog and all global tables.
</span><span class="cx"> * @param bool $prefix Whether to include table prefixes. Default true. If blog
</span><span class="cx"> * prefix is requested, then the custom users and usermeta tables will be mapped.
</span><span class="cx"> * @param int $blog_id The blog_id to prefix. Defaults to main blog. Used only when prefix is requested.
</span><del>- * @return array Table names. When a prefix is requested, the key is the
- * unprefixed table name.
</del><ins>+ * @return array Table names. When a prefix is requested, the key is the unprefixed table name.
</ins><span class="cx"> */
</span><span class="cx"> function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
</span><span class="cx"> switch ( $scope ) {
</span><span class="lines">@@ -641,6 +640,9 @@
</span><span class="cx"> case 'blog' :
</span><span class="cx"> $tables = $this->tables;
</span><span class="cx"> break;
</span><ins>+ case 'ms_global' :
+ $tables = $this->ms_global_tables;
+ break;
</ins><span class="cx"> case 'global' :
</span><span class="cx"> $tables = $this->global_tables;
</span><span class="cx"> if ( is_multisite() )
</span></span></pre>
</div>
</div>
</body>
</html>