<!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>[12757] trunk: options network page, db variable change, See #11644</title>
</head>
<body>

<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12757">12757</a></dd>
<dt>Author</dt> <dd>wpmuguru</dd>
<dt>Date</dt> <dd>2010-01-19 00:18:52 +0000 (Tue, 19 Jan 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>options network page, db variable change, See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmenuphp">trunk/wp-admin/menu.php</a></li>
<li><a href="#trunkwpincludeswpdbphp">trunk/wp-includes/wp-db.php</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkwpadminoptionsnetworkphp">trunk/wp-admin/options-network.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/menu.php (12756 => 12757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/menu.php        2010-01-19 00:04:25 UTC (rev 12756)
+++ trunk/wp-admin/menu.php        2010-01-19 00:18:52 UTC (rev 12757)
</span><span class="lines">@@ -158,6 +158,9 @@
</span><span class="cx">         $submenu['options-general.php'][40] = array(__('Permalinks'), 'manage_options', 'options-permalink.php');
</span><span class="cx">         if ( is_super_admin() )
</span><span class="cx">                 $submenu['options-general.php'][45] = array(__('Miscellaneous'), 'manage_options', 'options-misc.php');
</span><ins>+        if ( !is_multisite() &amp;&amp; is_super_admin() ) {
+                $submenu['options-general.php'][50] = array(__('Network'), 'manage_options', 'options-network.php');
+        }
</ins><span class="cx"> 
</span><span class="cx"> $_wp_last_utility_menu = 80; // The index of the last top-level menu in the utility menu group
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkwpadminoptionsnetworkphp"></a>
<div class="addfile"><h4>Added: trunk/wp-admin/options-network.php (0 => 12757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/options-network.php                                (rev 0)
+++ trunk/wp-admin/options-network.php        2010-01-19 00:18:52 UTC (rev 12757)
</span><span class="lines">@@ -0,0 +1,333 @@
</span><ins>+&lt;?php
+/**
+ * Network settings administration panel.
+ *
+ * @since 3.0
+ *
+ * @package WordPress
+ * @subpackage Administration
+ */
+
+/** WordPress Administration Bootstrap */
+require_once('./admin.php');
+
+if ( ! is_super_admin() )
+        wp_die(__('You do not have sufficient permissions to manage options for this blog.'));
+
+$title = __('Network Settings');
+$parent_file = 'options-network.php';
+
+add_contextual_help($current_screen, __('&lt;a href=&quot;http://codex.wordpress.org/Settings_Network_SubPanel&quot; target=&quot;_blank&quot;&gt;Network Settings&lt;/a&gt;'));
+
+include('./admin-header.php');
+/*
+This option panel does not save data to the options table.
+It contains a multi-step process allowing the user to enable a network of WordPress sites.
+*/
+
+$dirs = array( substr( ABSPATH, 0, -1), ABSPATH . &quot;wp-content&quot; );
+?&gt;
+&lt;div class=&quot;wrap&quot;&gt;
+&lt;?php screen_icon(); ?&gt;
+&lt;h2&gt;&lt;?php echo esc_html( $title ); ?&gt;&lt;/h2&gt;
+
+&lt;form method=&quot;post&quot; action=&quot;options-network.php&quot;&gt;
+&lt;?php
+function filestats( $err ) {
+        print &quot;&lt;h2&gt;Server Summary&lt;/h2&gt;&quot;;
+        print &quot;&lt;p&gt;If you post a message to the WordPress support forum at &lt;a target='_blank' href='http://wordpress.org/support/'&gt;http://wordpress.org/support/&lt;/a&gt; then copy and paste the following information into your message:&lt;/p&gt;&quot;;
+
+        print &quot;&lt;blockquote style='background: #eee; border: 1px solid #333; padding: 5px;'&gt;&quot;;
+        print &quot;&lt;br /&gt;&lt;strong&gt;ERROR: $err&lt;/strong&gt;&lt;br /&gt;&quot;;
+        clearstatcache();
+        $files = array( &quot;htaccess.dist&quot;, &quot;.htaccess&quot; );
+        
+        foreach ( (array) $files as $val ) {
+                $stats = @stat( $val );
+                if( $stats ) {
+                        print &quot;&lt;h2&gt;$val&lt;/h2&gt;&quot;;
+                        print &quot;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;uid/gid: &quot; . $stats[ 'uid' ] . &quot;/&quot; . $stats[ 'gid' ] . &quot;&lt;br /&gt;\n&quot;;
+                        print &quot;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;size: &quot; . $stats[ 'size' ] . &quot;&lt;br /&gt;&quot;;
+                        print &quot;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;perms: &quot; . substr( sprintf('%o', fileperms( $val ) ), -4 ) . &quot;&lt;br /&gt;&quot;;
+                        print &quot;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;readable: &quot;;
+                        print is_readable( $val ) == true ? &quot;yes&quot; : &quot;no&quot;;
+                        print &quot;&lt;br /&gt;&quot;;
+                        print &quot;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;writeable: &quot;;
+                        print is_writeable( $val ) == true ? &quot;yes&quot; : &quot;no&quot;;
+                        print &quot;&lt;br /&gt;&quot;;
+                } elseif( file_exists( $val ) == false ) {
+                        print &quot;&lt;h2&gt;$val&lt;/h2&gt;&quot;;
+                        print &quot;&amp;nbsp;&amp;nbsp;&amp;nbsp;&amp;nbsp;FILE NOT FOUND: $val&lt;br /&gt;&quot;;
+                }
+        }
+        print &quot;&lt;/blockquote&gt;&quot;;
+}
+
+function step2_htaccess() {
+        global $base;
+
+        // remove ending slash from $base and $url
+        $htaccess = '';
+        if( substr($base, -1 ) == '/') {
+                $base = substr($base, 0, -1);
+        }
+        $htaccess_sample = ABSPATH . 'wp-admin/includes/htaccess.ms';
+        if ( !file_exists( $htaccess_sample ) )
+                wp_die(&quot;Sorry, I need a {$htaccess_sample} to work from. Please re-upload this file to your WordPress installation.&quot;);
+
+        $htaccess_file = file( $htaccess_sample );
+        $fp = @fopen( $htaccess_sample, &quot;r&quot; );
+        if( $fp ) {
+                while( !feof( $fp ) ) {
+                        $htaccess .= fgets( $fp, 4096 );
+                }
+                fclose( $fp );
+                $htaccess_file = str_replace( &quot;BASE&quot;, $base, $htaccess );
+        } else {
+                wp_die(&quot;Sorry, I need to be able to read {$htaccess_sample}. Please check the permissions on this file.&quot;);
+        }
+
+        //@todo: check for super-cache in use
+?&gt;
+                        &lt;li&gt;&lt;p&gt;Replace the contents of your &lt;code&gt;.htaccess&lt;/code&gt; with the following:&lt;/p&gt;
+                                &lt;textarea name=&quot;htaccess&quot; cols=&quot;120&quot; rows=&quot;20&quot;&gt;
+&lt;?php echo $htaccess_file; ?&gt;
+                                &lt;/textarea&gt;
+                        &lt;/li&gt;
+&lt;?php
+}
+
+function step1() {
+        $rewrite_enabled = false;
+        ?&gt;
+        &lt;h2&gt;Installing Network of WordPress Sites&lt;/h2&gt;
+        &lt;p&gt;I will help you enable the features for creating a network of sites by asking you a few questions so that you can create configuration files and make a directory to store all your uploaded files.&lt;/p&gt;
+        
+        &lt;h2&gt;What do I need?&lt;/h2&gt;
+        &lt;ul&gt;
+                &lt;li&gt;Access to your server to change directory permissions. This can be done through ssh or ftp for example.&lt;/li&gt;
+                &lt;li&gt;A valid email where your password and administrative emails will be sent.&lt;/li&gt;
+                &lt;li&gt; Wildcard dns records if you're going to use the virtual host (sub-domain) functionality. Check the &lt;a href='http://trac.mu.wordpress.org/browser/trunk/README.txt'&gt;README&lt;/a&gt; for further details.&lt;/li&gt;
+        &lt;/ul&gt;
+        &lt;?php
+        $mod_rewrite_msg = &quot;&lt;p&gt;If the &lt;code&gt;mod_rewrite&lt;/code&gt; module is disabled ask your administrator to enable that module, or look at the &lt;a href='http://httpd.apache.org/docs/mod/mod_rewrite.html'&gt;Apache documentation&lt;/a&gt; or &lt;a href='http://www.google.com/search?q=apache+mod_rewrite'&gt;elsewhere&lt;/a&gt; for help setting it up.&lt;/p&gt;&quot;;
+        
+        if( function_exists( &quot;apache_get_modules&quot; ) ) {
+                $modules = apache_get_modules();
+                if( in_array( &quot;mod_rewrite&quot;, $modules ) == false ) {
+                        echo &quot;&lt;p&gt;&lt;strong&gt;Warning!&lt;/strong&gt; It looks like mod_rewrite is not installed.&lt;/p&gt;&quot; . $mod_rewrite_msg;
+                } else {
+                        $rewrite_enabled = true;
+                }
+        } else {
+                ?&gt;&lt;p&gt;Please make sure &lt;code&gt;mod_rewrite&lt;/code&gt; is installed as it will be activated at the end of this install.&lt;/p&gt;&lt;?php
+                echo $mod_rewrite_msg;
+        }
+        return $rewrite_enabled;
+}
+
+function printstep1form( $rewrite_enabled = false ) {
+        $weblog_title = ucfirst( get_option( 'blogname' ) ) . ' Sites';
+        $email = get_option( 'admin_email' );
+        $hostname = $_SERVER[ 'HTTP_HOST' ];
+        if( substr( $_SERVER[ 'HTTP_HOST' ], 0, 4 ) == 'www.' )
+                $hostname = str_replace( &quot;www.&quot;, &quot;&quot;, $_SERVER[ 'HTTP_HOST' ] );
+
+        wp_nonce_field( 'install-network-1' );
+        ?&gt;
+                &lt;input type='hidden' name='action' value='step2' /&gt;
+                &lt;h2&gt;Site Addresses&lt;/h2&gt;
+                &lt;p&gt;Please choose whether you would like sites in your WordPress install to use sub-domains or sub-directories. You can not change this later.&lt;/p&gt;
+                &lt;?php if ( !$rewrite_enabled ) { ?&gt;
+                &lt;p&gt;&lt;strong&gt;Note&lt;/strong&gt; It looks like &lt;code&gt;mod_rewrite&lt;/code&gt; is not installed.&lt;/p&gt;
+                &lt;?php } ?&gt;
+                &lt;p class=&quot;blog-address&quot;&gt;
+                        &lt;label&gt;&lt;input type='radio' name='vhost' value='yes' &lt;?php if( $rewrite_enabled ) echo 'checked=&quot;checked&quot;'; ?&gt; /&gt; Sub-domains (like &lt;code&gt;blog1.example.com&lt;/code&gt;)&lt;/label&gt;&lt;br /&gt;
+                        &lt;label&gt;&lt;input type='radio' name='vhost' value='no' &lt;?php if( !$rewrite_enabled ) echo 'checked=&quot;checked&quot;'; ?&gt; /&gt; Sub-directories (like &lt;code&gt;example.com/blog1&lt;/code&gt;)&lt;/label&gt;
+                &lt;/p&gt;
+
+                &lt;h2&gt;Server Address&lt;/h2&gt;
+                &lt;table class=&quot;form-table&quot;&gt;  
+                        &lt;tr&gt; 
+                                &lt;th scope='row'&gt;Server Address&lt;/th&gt; 
+                                &lt;td&gt;
+                                        &lt;p&gt;What is the Internet address of your site? You should enter the shortest address possible. For example, use &lt;em&gt;example.com&lt;/em&gt; instead of &lt;em&gt;www.example.com&lt;/em&gt; but if you are going to use an address like &lt;em&gt;blogs.example.com&lt;/em&gt; then enter that unaltered in the box below.&lt;/p&gt;
+                                        &lt;input type='text' name='basedomain' value='&lt;?php echo $hostname ?&gt;' /&gt;
+                                        &lt;p&gt;Do not use an IP address (like 127.0.0.1) or a single word hostname like &lt;q&gt;localhost&lt;/q&gt; as your server address, use &lt;q&gt;localhost.localdomain&lt;/q&gt; instead.&lt;/p&gt;
+                                &lt;/td&gt; 
+                        &lt;/tr&gt;
+                &lt;/table&gt;
+
+                &lt;h2&gt;Site Details&lt;/h2&gt;
+                &lt;table class=&quot;form-table&quot;&gt;  
+                        &lt;tr&gt; 
+                                &lt;th scope='row'&gt;Site&amp;nbsp;Title&lt;/th&gt; 
+                                &lt;td&gt;
+                                        &lt;input name='weblog_title' type='text' size='45' value='&lt;?php echo $weblog_title ?&gt;' /&gt;
+                                        &lt;br /&gt;What would you like to call your site?
+                                &lt;/td&gt; 
+                        &lt;/tr&gt; 
+                        &lt;tr&gt; 
+                                &lt;th scope='row'&gt;Email&lt;/th&gt; 
+                                &lt;td&gt;
+                                        &lt;input name='email' type='text' size='45' value='&lt;?php echo $email ?&gt;' /&gt; 
+                                        &lt;br /&gt;Your email address.
+                                &lt;/td&gt; 
+                        &lt;/tr&gt; 
+                &lt;/table&gt; 
+                &lt;p class='submit'&gt;&lt;input class=&quot;button&quot; name='submit' type='submit' value='Proceed' /&gt;&lt;/p&gt;
+        &lt;?php
+}
+
+function step2() {
+?&gt;
+                &lt;h2&gt;Enabling WordPress Sites&lt;/h2&gt;
+                &lt;p&gt;Complete the following steps to enable the features for creating a network of sites. &lt;strong&gt;Note:&lt;/strong&gt; We recommend you make a backup copy of your existing &lt;code&gt;wp-config.php&lt;/code&gt; and &lt;code&gt;.htaccess&lt;/code&gt; files.&lt;/p&gt;
+                &lt;ol&gt;
+                        &lt;li&gt;Create a &lt;code&gt;blogs.dir&lt;/code&gt; directory in your &lt;code&gt;wp-content&lt;/code&gt; directory. This directory is used to stored uploaded media for your additional sites and must be writeable by the web server.&lt;/li&gt;
+&lt;?php step2_config(); ?&gt;
+&lt;?php step2_htaccess(); ?&gt;
+                &lt;/ol&gt;
+&lt;?php
+}
+
+function step2_config() {
+        global $base, $wpdb, $vhost;
+
+        $vhost   = stripslashes($_POST['vhost' ]);
+        $prefix  = $wpdb-&gt;base_prefix;
+
+        $config_sample = ABSPATH . 'wp-admin/includes/wp-config.ms';
+        if ( !file_exists( $config_sample ) )
+                wp_die(&quot;Sorry, I need a {$config_sample} to work from. Please re-upload this file to your WordPress installation.&quot;);
+
+        $wp_config_file = file( $config_sample );
+?&gt;
+                        &lt;li&gt;&lt;p&gt;Replace the contents of your &lt;code&gt;wp-config.php&lt;/code&gt; with the following:&lt;/p&gt;
+                                &lt;textarea name=&quot;wp-config&quot; cols=&quot;120&quot; rows=&quot;20&quot;&gt;
+&lt;?php
+        foreach ($wp_config_file as $line) {
+                switch ( trim( substr($line,0,16) ) ) {
+                        case &quot;define('DB_NAME'&quot;:
+                                $output = str_replace(&quot;wordpress&quot;, DB_NAME, $line);
+                                break;
+                        case &quot;define('DB_USER'&quot;:
+                                $output = str_replace(&quot;username&quot;, DB_USER, $line);
+                                break;
+                        case &quot;define('DB_PASSW&quot;:
+                                $output = str_replace(&quot;password&quot;, DB_PASSWORD, $line);
+                                break;
+                        case &quot;define('DB_HOST'&quot;:
+                                $output = str_replace(&quot;localhost&quot;, DB_HOST, $line);
+                                break;
+                        case &quot;define('VHOST',&quot;:
+                                $output = str_replace(&quot;VHOSTSETTING&quot;, $vhost, $line);
+                                break;
+                        case '$table_prefix  =':
+                                $output = str_replace('wp_', $prefix, $line);
+                                break;
+                        case '$base = \'BASE\';':
+                                $output = str_replace('BASE', $base, $line);
+                                break;
+                        case &quot;define('DOMAIN_C&quot;:
+                                $domain = get_clean_basedomain();
+                                $output = str_replace(&quot;current_site_domain&quot;, $domain, $line);
+                                break;
+                        case &quot;define('PATH_CUR&quot;:
+                                $output = str_replace(&quot;current_site_path&quot;, $base, $line);
+                                break;
+                        case &quot;define('AUTH_KEY&quot;:
+                        case &quot;define('AUTH_SAL&quot;:
+                        case &quot;define('LOGGED_I&quot;:
+                        case &quot;define('SECURE_A&quot;:
+                        case &quot;define('NONCE_KE&quot;:
+                                $constant = substr( $line, 8, strpos( $line, &quot;'&quot;, 9 ) - 8 );
+                                if ( defined( $constant ) )
+                                        $hash = constant( $constant );
+                                else
+                                        $hash = md5( mt_rand() ) . md5( mt_rand() );
+                                $output = str_replace('put your unique phrase here', $hash, $line);
+                                break;
+                        default:
+                                $output = $line;
+                                break;
+                }
+                echo $output;
+        }
+?&gt;
+                                &lt;/textarea&gt;
+                        &lt;/li&gt;
+&lt;?php
+}
+
+function get_clean_basedomain() {
+        global $wpdb;
+        $domain =   $wpdb-&gt;escape( $_POST[ 'basedomain' ] );
+        $domain = str_replace( 'http://', '', $domain );
+        if( substr( $domain, 0, 4 ) == 'www.' )
+                $domain = substr( $domain, 4 );
+        if( strpos( $domain, '/' ) )
+                $domain = substr( $domain, 0, strpos( $domain, '/' ) );
+        return $domain;
+}
+
+function nowww() {
+        $nowww = str_replace( 'www.', '', $_POST[ 'basedomain' ] );
+        ?&gt;
+        &lt;h2&gt;No-www&lt;/h2&gt;
+        &lt;p&gt;WordPress strips the string &quot;www&quot; from the URLs of sites using this software. It is still possible to visit your site using the &quot;www&quot; prefix with an address like &lt;em&gt;&lt;?php echo $_POST[ 'basedomain' ] ?&gt;&lt;/em&gt; but any links will not have the &quot;www&quot; prefix. They will instead point at &lt;?php echo $nowww ?&gt;.&lt;/p&gt;
+        &lt;p&gt;The preferred method of hosting sites is without the &quot;www&quot; prefix as it's more compact and simple.&lt;/p&gt;
+        &lt;p&gt;You can still use &quot;&lt;?php echo $_POST[ 'basedomain' ] ?&gt;&quot; and URLs like &quot;www.blog1.&lt;?php echo $nowww; ?&gt;&quot; to address your site and blogs after installation but internal links will use the &lt;?php echo $nowww ?&gt; format.&lt;/p&gt;
+
+        &lt;p&gt;&lt;a href=&quot;http://no-www.org/&quot;&gt;www. is depreciated&lt;/a&gt; has a lot more information on why 'www.' isn't needed any more.&lt;/p&gt;
+        &lt;p&gt;
+        &lt;?php wp_nonce_field( 'install-network-1' ); ?&gt;
+                &lt;input type='hidden' name='vhost' value='&lt;?php echo $_POST[ 'vhost' ]; ?&gt;' /&gt;
+                &lt;input type='hidden' name='weblog_title' value='&lt;?php echo $_POST[ 'weblog_title' ]; ?&gt;' /&gt;
+                &lt;input type='hidden' name='email' value='&lt;?php echo $_POST[ 'email' ]; ?&gt;' /&gt;
+                &lt;input type='hidden' name='action' value='step2' /&gt;
+                &lt;input type='hidden' name='basedomain' value='&lt;?echo $nowww ?&gt;' /&gt;
+                &lt;input class=&quot;button&quot; type='submit' value='Continue' /&gt;
+        &lt;/p&gt;
+        &lt;?php
+}
+
+$action = isset($_POST[ 'action' ]) ? $_POST[ 'action' ] : null; 
+switch($action) {
+        case &quot;step2&quot;:
+                check_admin_referer( 'install-network-1' );
+                if( substr( $_POST[ 'basedomain' ], 0, 4 ) == 'www.' ) {
+                        nowww();
+                        continue;
+                }
+                
+                // Install!
+                $base = stripslashes( dirname( dirname($_SERVER[&quot;SCRIPT_NAME&quot;]) ) );
+                if( $base != &quot;/&quot;)
+                        $base .= &quot;/&quot;;
+
+                require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+                // create network tables
+                $_SERVER[ 'HTTP_HOST' ] = str_replace( 'www.', '', $_SERVER[ 'HTTP_HOST' ] ); // normalise hostname - no www.
+                install_network();
+                populate_network( 1, $_SERVER[ 'HTTP_HOST' ], sanitize_email( $_POST[ 'email' ] ), $_POST[ 'weblog_title' ], $base, $_POST[ 'vhost' ] );
+                // create wp-config.php / htaccess
+                step2();
+//continue;
+                
+//                step3();
+        break;
+        default:
+                //@todo: give an informative screen instead
+                if ( is_multisite() ) {
+                        wp_die('Network already enabled');
+                }
+                $rewrite_enabled = step1();
+                printstep1form($rewrite_enabled);
+        break;
+}
+?&gt;
+&lt;/form&gt;
+&lt;/div&gt;
+
+&lt;?php include('./admin-footer.php'); ?&gt;
</ins></span></pre></div>
<a id="trunkwpincludeswpdbphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/wp-db.php (12756 => 12757)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/wp-db.php        2010-01-19 00:04:25 UTC (rev 12756)
+++ trunk/wp-includes/wp-db.php        2010-01-19 00:18:52 UTC (rev 12757)
</span><span class="lines">@@ -491,7 +491,7 @@
</span><span class="cx">         function get_blog_prefix( $blog_id = '' ) {
</span><span class="cx">                 if ( $blog_id ) {
</span><span class="cx">                         if( defined('MULTISITE') &amp;&amp; ( $blog_id == 0 || $blog_id == 1) ) {
</span><del>-                                return $this-&gt;prefix;
</del><ins>+                                return $this-&gt;base_prefix;
</ins><span class="cx">                         } else {
</span><span class="cx">                                 return $this-&gt;base_prefix . $blog_id . '_';
</span><span class="cx">                         }
</span></span></pre>
</div>
</div>

</body>
</html>