<!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>[12773] trunk/wp-includes/ms-load.php: White space clean-up.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12773">12773</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2010-01-20 07:44:47 +0000 (Wed, 20 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>White space clean-up. See <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (12772 => 12773)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-01-20 07:37:53 UTC (rev 12772)
+++ trunk/wp-includes/ms-load.php 2010-01-20 07:44:47 UTC (rev 12773)
</span><span class="lines">@@ -10,10 +10,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> */
</span><del>-if( defined( 'SUNRISE' ) )
</del><ins>+if ( defined( 'SUNRISE' ) )
</ins><span class="cx"> include_once( WP_CONTENT_DIR . '/sunrise.php' );
</span><span class="cx">
</span><del>- require( ABSPATH . WPINC . '/ms-settings.php' );
</del><ins>+require( ABSPATH . WPINC . '/ms-settings.php' );
</ins><span class="cx"> $wpdb->blogid = $current_blog->blog_id;
</span><span class="cx"> $wpdb->siteid = $current_blog->site_id;
</span><span class="cx"> $wpdb->set_prefix($table_prefix); // set up blog tables
</span><span class="lines">@@ -30,22 +30,22 @@
</span><span class="cx"> wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if( !defined( "UPLOADBLOGSDIR" ) )
- define( "UPLOADBLOGSDIR", 'wp-content/blogs.dir' );
</del><ins>+if ( !defined( 'UPLOADBLOGSDIR' ) )
+ define( 'UPLOADBLOGSDIR', 'wp-content/blogs.dir' );
</ins><span class="cx">
</span><del>-if( !defined( "UPLOADS" ) )
- define( "UPLOADS", UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
</del><ins>+if ( !defined( 'UPLOADS' ) )
+ define( 'UPLOADS', UPLOADBLOGSDIR . "/{$wpdb->blogid}/files/" );
</ins><span class="cx">
</span><del>-if( !defined( "BLOGUPLOADDIR" ) )
- define( "BLOGUPLOADDIR", WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
</del><ins>+if ( !defined( 'BLOGUPLOADDIR' ) )
+ define( 'BLOGUPLOADDIR', WP_CONTENT_DIR . "/blogs.dir/{$wpdb->blogid}/files/" );
</ins><span class="cx">
</span><span class="cx"> function ms_network_settings() {
</span><span class="cx"> global $wpdb, $current_site, $cookiehash;
</span><span class="cx">
</span><del>- if( !isset($current_site->site_name) )
</del><ins>+ if ( !isset($current_site->site_name) )
</ins><span class="cx"> $current_site->site_name = get_site_option('site_name');
</span><span class="cx">
</span><del>- if( $current_site->site_name == false )
</del><ins>+ if ( $current_site->site_name == false )
</ins><span class="cx"> $current_site->site_name = ucfirst( $current_site->domain );
</span><span class="cx">
</span><span class="cx"> $wpdb->hide_errors();
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> $network_plugins = array();
</span><span class="cx"> $deleted_sitewide_plugins = array();
</span><span class="cx"> $wpmu_sitewide_plugins = (array) maybe_unserialize( get_site_option( 'wpmu_sitewide_plugins' ) );
</span><del>- foreach( $wpmu_sitewide_plugins as $plugin_file => $activation_time ) {
</del><ins>+ foreach ( $wpmu_sitewide_plugins as $plugin_file => $activation_time ) {
</ins><span class="cx"> if ( !$plugin_file )
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> $active_sitewide_plugins = maybe_unserialize( get_site_option( 'active_sitewide_plugins' ) );
</span><span class="cx">
</span><span class="cx"> /* Remove any deleted plugins from the wpmu_sitewide_plugins array */
</span><del>- foreach( $deleted_sitewide_plugins as $plugin_file ) {
</del><ins>+ foreach ( $deleted_sitewide_plugins as $plugin_file ) {
</ins><span class="cx"> unset( $wpmu_sitewide_plugins[$plugin_file] );
</span><span class="cx"> unset( $active_sitewide_plugins[$plugin_file] );
</span><span class="cx"> }
</span><span class="lines">@@ -82,70 +82,70 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function ms_site_check() {
</span><del>- global $wpdb, $current_blog;
</del><ins>+ global $wpdb, $current_blog;
</ins><span class="cx">
</span><del>- $wpdb->show_errors();
</del><ins>+ $wpdb->show_errors();
</ins><span class="cx">
</span><del>- if ( '1' == $current_blog->deleted ) {
- if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
- return WP_CONTENT_DIR . '/blog-deleted.php';
- } else {
- header('HTTP/1.1 410 Gone');
- graceful_fail(__('This user has elected to delete their account and the content is no longer available.'));
- }
- }
</del><ins>+ if ( '1' == $current_blog->deleted ) {
+ if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
+ return WP_CONTENT_DIR . '/blog-deleted.php';
+ } else {
+ header('HTTP/1.1 410 Gone');
+ graceful_fail(__('This user has elected to delete their account and the content is no longer available.'));
+ }
+ }
</ins><span class="cx">
</span><del>- if ( '2' == $current_blog->deleted ) {
- if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
- return WP_CONTENT_DIR . '/blog-inactive.php';
- } else {
- graceful_fail( sprintf( __( 'This blog has not been activated yet. If you are having problems activating your blog, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
- }
- }
</del><ins>+ if ( '2' == $current_blog->deleted ) {
+ if ( file_exists( WP_CONTENT_DIR . '/blog-inactive.php' ) ) {
+ return WP_CONTENT_DIR . '/blog-inactive.php';
+ } else {
+ graceful_fail( sprintf( __( 'This blog has not been activated yet. If you are having problems activating your blog, please contact <a href="mailto:%1$s">%1$s</a>.' ), str_replace( '@', ' AT ', get_site_option( 'admin_email', "support@{$current_site->domain}" ) ) ) );
+ }
+ }
</ins><span class="cx">
</span><del>- if( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
- if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
- return WP_CONTENT_DIR . '/blog-suspended.php';
- } else {
- header('HTTP/1.1 410 Gone');
- graceful_fail(__('This blog has been archived or suspended.'));
- }
- }
- return true;
</del><ins>+ if( $current_blog->archived == '1' || $current_blog->spam == '1' ) {
+ if ( file_exists( WP_CONTENT_DIR . '/blog-suspended.php' ) ) {
+ return WP_CONTENT_DIR . '/blog-suspended.php';
+ } else {
+ header('HTTP/1.1 410 Gone');
+ graceful_fail(__('This blog has been archived or suspended.'));
+ }
+ }
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function ms_network_cookies() {
</span><del>- global $current_site;
- /**
- * It is possible to define this in wp-config.php
- * @since 1.2.0
- */
- if ( !defined('COOKIEPATH') )
- define('COOKIEPATH', $current_site->path );
</del><ins>+ global $current_site;
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 1.2.0
+ */
+ if ( !defined( 'COOKIEPATH' ) )
+ define( 'COOKIEPATH', $current_site->path );
</ins><span class="cx">
</span><del>- /**
- * It is possible to define this in wp-config.php
- * @since 1.5.0
- */
- if ( !defined('SITECOOKIEPATH') )
- define('SITECOOKIEPATH', $current_site->path );
</del><ins>+ /**
+ * It is possible to define this in wp-config.php
+ * @since 1.5.0
+ */
+ if ( !defined( 'SITECOOKIEPATH' ) )
+ define( 'SITECOOKIEPATH', $current_site->path );
</ins><span class="cx">
</span><del>- /**
- * It is possible to define this in wp-config.php
- * @since 2.6.0
- */
- if ( !defined('ADMIN_COOKIE_PATH') ) {
- if( !is_subdomain_install() ) {
- define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
- } else {
- define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
- }
- }
- /**
- * It is possible to define this in wp-config.php
- * @since 2.0.0
- */
- if ( !defined('COOKIE_DOMAIN') )
- define('COOKIE_DOMAIN', '.' . $current_site->domain);
</del><ins>+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.6.0
+ */
+ if ( !defined( 'ADMIN_COOKIE_PATH' ) ) {
+ if( !is_subdomain_install() ) {
+ define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH );
+ } else {
+ define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' );
+ }
+ }
+ /**
+ * It is possible to define this in wp-config.php
+ * @since 2.0.0
+ */
+ if ( !defined('COOKIE_DOMAIN') )
+ define('COOKIE_DOMAIN', '.' . $current_site->domain);
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span></span></pre>
</div>
</div>
</body>
</html>