<!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>[13644] trunk/wp-admin:
Remove unused MU function and unnecessary separate includes file.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/13644">13644</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-03-10 08:46:05 +0000 (Wed, 10 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove unused MU function and unnecessary separate includes file. see <a href="http://trac.wordpress.org/ticket/11816">#11816</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminnetworkphp">trunk/wp-admin/network.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesnetworkphp">trunk/wp-admin/includes/network.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesnetworkphp"></a>
<div class="delfile"><h4>Deleted: trunk/wp-admin/includes/network.php (13643 => 13644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/network.php 2010-03-10 08:41:09 UTC (rev 13643)
+++ trunk/wp-admin/includes/network.php 2010-03-10 08:46:05 UTC (rev 13644)
</span><span class="lines">@@ -1,78 +0,0 @@
</span><del>-<?php
-/**
- * Network installation functions.
- *
- * @since 3.0.0
- *
- * @package WordPress
- * @subpackage Multisite
- */
-
-/**
- * Gets base domain of network.
- *
- * @since 3.0.0
- */
-function get_clean_basedomain() {
- global $wpdb;
-
- $existing_domain = network_domain_check();
- if ( $existing_domain )
- return $existing_domain;
-
- $domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
- if ( strpos( $domain, '/' ) )
- $domain = substr( $domain, 0, strpos( $domain, '/' ) );
- return $domain;
-}
-
-/**
- * Checks for existing network data/tables.
- *
- * @since 3.0.0
- */
-function network_domain_check() {
- global $wpdb;
-
- if ( $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
- return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" );
-
- return false;
-}
-
-/**
- * Prints summary of server statistics in preparation for setting up a network.
- *
- * @since 3.0.0
- */
-function filestats( $err ) {
-?>
- <h2><?php esc_html_e( 'Server Summary' ); ?></h2>
- <p><?php _e( 'If you post a message to the WordPress support forum at <a target="_blank" href="http://wordpress.org/support/">http://wordpress.org/support/</a> then copy and paste the following information into your message:' ); ?></p>
- <blockquote style="background: #eee; border: 1px solid #333; padding: 5px;">
- <br /><strong><?php printf( __( 'ERROR: %s' ), $err ); ?></strong><br />
-<?php
- clearstatcache();
- $files = array( 'htaccess.dist', '.htaccess' );
-
- $indent = '&nbsp;&nbsp;&nbsp;&nbsp;';
- foreach ( (array) $files as $val ) {
- $stats = @stat( $val );
- if ( $stats ) {
-?>
- <h2><?php echo esc_html( $val ); ?></h2>
- <?php echo $indent . sprintf( __( 'uid/gid: %1$s/%2$s' ), $stats['uid'], $stats['gid'] ); ?><br />
- <?php echo $indent . sprintf( __( 'size: %s' ), $stats['size'] ); ?><br/>
- <?php echo $indent . sprintf( __( 'perms: %s' ), substr( sprintf( '%o', fileperms( $val ) ), -4 ) ); ?><br/>
- <?php echo $indent . sprintf( __( 'readable: %s' ), is_readable( $val ) ? __( 'yes' ) : __( 'no' ) ); ?><br/>
- <?php echo $indent . sprintf( __( 'writeable: %s' ), is_writeable( $val ) ? __( 'yes' ) : __( 'no' ) ); ?><br/>
-<?php
- } elseif ( ! file_exists( $val ) ) {
-?>
- <h2><?php echo esc_html( $val ); ?></h2>
- <?php echo $indent . sprintf( __( 'FILE NOT FOUND: %s' ), $val ); ?><br/>
-<?php
- }
- }
- echo "</blockquote>";
-}
</del></span></pre></div>
<a id="trunkwpadminnetworkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/network.php (13643 => 13644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/network.php 2010-03-10 08:41:09 UTC (rev 13643)
+++ trunk/wp-admin/network.php 2010-03-10 08:46:05 UTC (rev 13644)
</span><span class="lines">@@ -16,12 +16,38 @@
</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 site.' ) );
</span><span class="cx">
</span><del>-include( ABSPATH . 'wp-admin/includes/network.php' );
-
</del><span class="cx"> // We need to create references to ms global tables to enable Network.
</span><span class="cx"> foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table )
</span><span class="cx"> $wpdb->$table = $prefixed_table;
</span><span class="cx">
</span><ins>+/**
+ * Check for existing network data/tables.
+ *
+ * @since 3.0.0
+ */
+function network_domain_check() {
+ global $wpdb;
+ if ( $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
+ return $wpdb->get_var( "SELECT domain FROM $wpdb->site ORDER BY id ASC LIMIT 1" );
+ return false;
+}
+
+/**
+ * Get base domain of network.
+ *
+ * @since 3.0.0
+ */
+function get_clean_basedomain() {
+ global $wpdb;
+ $existing_domain = network_domain_check();
+ if ( $existing_domain )
+ return $existing_domain;
+ $domain = preg_replace( '|https?://|', '', get_option( 'siteurl' ) );
+ if ( strpos( $domain, '/' ) )
+ $domain = substr( $domain, 0, strpos( $domain, '/' ) );
+ return $domain;
+}
+
</ins><span class="cx"> if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) )
</span><span class="cx"> wp_die( __( 'You must define the <code>WP_ALLOW_MULTISITE</code> constant as true in your wp-config.php file to allow creation of a Network.' ) );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>