<!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>[14198] trunk: Move ms_site_check()
to after init and allow super admins to view blocked sites.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14198">14198</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-04-23 16:18:33 +0000 (Fri, 23 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move ms_site_check() to after init and allow super admins to view blocked sites. see <a href="http://trac.wordpress.org/ticket/13094">#13094</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.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 (14197 => 14198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-04-23 16:10:48 UTC (rev 14197)
+++ trunk/wp-includes/ms-load.php 2010-04-23 16:18:33 UTC (rev 14198)
</span><span class="lines">@@ -38,6 +38,15 @@
</span><span class="cx"> function ms_site_check() {
</span><span class="cx"> global $wpdb, $current_blog;
</span><span class="cx">
</span><ins>+ // Allow short-circuiting
+ $check = apply_filters('ms_site_check', null);
+ if ( null !== $check )
+ return;
+
+ // Allow super admins to see blocked sites
+ if ( is_super_admin() )
+ return true;
+
</ins><span class="cx"> if ( '1' == $current_blog->deleted ) {
</span><span class="cx"> if ( file_exists( WP_CONTENT_DIR . '/blog-deleted.php' ) ) {
</span><span class="cx"> return WP_CONTENT_DIR . '/blog-deleted.php';
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (14197 => 14198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-04-23 16:10:48 UTC (rev 14197)
+++ trunk/wp-settings.php 2010-04-23 16:18:33 UTC (rev 14198)
</span><span class="lines">@@ -153,16 +153,8 @@
</span><span class="cx">
</span><span class="cx"> do_action( 'muplugins_loaded' );
</span><span class="cx">
</span><del>-// Check site status if multisite.
-if ( is_multisite() ) {
- if ( true !== ( $file = ms_site_check() ) ) {
- require( $file );
- die();
- }
- unset($file);
-
</del><ins>+if ( is_multisite() )
</ins><span class="cx"> ms_cookie_constants( );
</span><del>-}
</del><span class="cx">
</span><span class="cx"> // Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
</span><span class="cx"> wp_cookie_constants( );
</span><span class="lines">@@ -290,6 +282,15 @@
</span><span class="cx"> */
</span><span class="cx"> do_action( 'init' );
</span><span class="cx">
</span><ins>+// Check site status
+if ( is_multisite() ) {
+ if ( true !== ( $file = ms_site_check() ) ) {
+ require( $file );
+ die();
+ }
+ unset($file);
+}
+
</ins><span class="cx"> /**
</span><span class="cx"> * This hook is fired once WP, all plugins, and the theme are fully loaded and instantiated.
</span><span class="cx"> *
</span></span></pre>
</div>
</div>
</body>
</html>