<!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>[12609] trunk: Introduce is_multisite().</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12609">12609</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2010-01-06 20:19:35 +0000 (Wed, 06 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Introduce is_multisite(). see <a href="http://trac.wordpress.org/ticket/11644">#11644</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminmsadminphp">trunk/wp-admin/ms-admin.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminmsoptionsphp">trunk/wp-admin/ms-options.php</a></li>
<li><a href="#trunkwpadminmssitesphp">trunk/wp-admin/ms-sites.php</a></li>
<li><a href="#trunkwpadminmsupgradesitephp">trunk/wp-admin/ms-upgrade-site.php</a></li>
<li><a href="#trunkwpadminmsusersphp">trunk/wp-admin/ms-users.php</a></li>
<li><a href="#trunkwpsettingsphp">trunk/wp-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminmsadminphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-admin.php (12608 => 12609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-admin.php 2010-01-06 20:10:37 UTC (rev 12608)
+++ trunk/wp-admin/ms-admin.php 2010-01-06 20:19:35 UTC (rev 12609)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><ins>+if ( !is_multisite() )
+ wp_die( __('Multisite support is not enabled.') );
+
</ins><span class="cx"> $title = __('WordPress MU &rsaquo; Admin');
</span><span class="cx"> $parent_file = 'wpmu-admin.php';
</span><span class="cx">
</span><span class="lines">@@ -11,7 +14,7 @@
</span><span class="cx">
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><del>-if( is_site_admin() == false ) {
</del><ins>+if ( is_site_admin() == false ) {
</ins><span class="cx"> wp_die( __('You do not have permission to access this page.') );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (12608 => 12609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-01-06 20:10:37 UTC (rev 12608)
+++ trunk/wp-admin/ms-edit.php 2010-01-06 20:19:35 UTC (rev 12609)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once('admin.php');
</span><ins>+
+if ( !is_multisite() )
+ wp_die( __('Multisite support is not enabled.') );
+
</ins><span class="cx"> if( is_site_admin() == false ) {
</span><span class="cx"> wp_die( __('You do not have permission to access this page.') );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpadminmsoptionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-options.php (12608 => 12609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-options.php 2010-01-06 20:10:37 UTC (rev 12608)
+++ trunk/wp-admin/ms-options.php 2010-01-06 20:19:35 UTC (rev 12609)
</span><span class="lines">@@ -1,5 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once('admin.php');
</span><ins>+
+if ( !is_multisite() )
+ wp_die( __('Multisite support is not enabled.') );
+
</ins><span class="cx"> $title = __('WordPress MU &rsaquo; Admin &rsaquo; Site Options');
</span><span class="cx"> $parent_file = 'wpmu-admin.php';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmssitesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-sites.php (12608 => 12609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-sites.php 2010-01-06 20:10:37 UTC (rev 12608)
+++ trunk/wp-admin/ms-sites.php 2010-01-06 20:19:35 UTC (rev 12609)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><ins>+if ( !is_multisite() )
+ wp_die( __('Multisite support is not enabled.') );
+
</ins><span class="cx"> $title = __('WordPress MU &rsaquo; Admin &rsaquo; Blogs');
</span><span class="cx"> $parent_file = 'wpmu-admin.php';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmsupgradesitephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-upgrade-site.php (12608 => 12609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-upgrade-site.php 2010-01-06 20:10:37 UTC (rev 12608)
+++ trunk/wp-admin/ms-upgrade-site.php 2010-01-06 20:19:35 UTC (rev 12609)
</span><span class="lines">@@ -1,12 +1,16 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once('admin.php');
</span><ins>+
+if ( !is_multisite() )
+ wp_die( __('Multisite support is not enabled.') );
+
</ins><span class="cx"> require_once( ABSPATH . WPINC . '/http.php' );
</span><span class="cx">
</span><span class="cx"> $title = __('WordPress MU &rsaquo; Admin &rsaquo; Upgrade Site');
</span><span class="cx"> $parent_file = 'wpmu-admin.php';
</span><span class="cx"> require_once('admin-header.php');
</span><span class="cx">
</span><del>-if( is_site_admin() == false ) {
</del><ins>+if ( is_site_admin() == false ) {
</ins><span class="cx"> wp_die( __('You do not have permission to access this page.') );
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminmsusersphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-users.php (12608 => 12609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-users.php 2010-01-06 20:10:37 UTC (rev 12608)
+++ trunk/wp-admin/ms-users.php 2010-01-06 20:19:35 UTC (rev 12609)
</span><span class="lines">@@ -1,6 +1,9 @@
</span><span class="cx"> <?php
</span><span class="cx"> require_once('admin.php');
</span><span class="cx">
</span><ins>+if ( !is_multisite() )
+ wp_die( __('Multisite support is not enabled.') );
+
</ins><span class="cx"> $title = __('WordPress MU &rsaquo; Admin &rsaquo; Users');
</span><span class="cx"> $parent_file = 'wpmu-admin.php';
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpsettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-settings.php (12608 => 12609)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-settings.php 2010-01-06 20:10:37 UTC (rev 12608)
+++ trunk/wp-settings.php 2010-01-06 20:19:35 UTC (rev 12609)
</span><span class="lines">@@ -323,6 +323,20 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Whether Multisite support is enabled
+ *
+ * @since 3.0
+ *
+ * @return bool True if multisite is enabled, false otherwise.
+ */
+function is_multisite() {
+ if ( defined('MULTISITE') )
+ return true;
+
+ return false;
+}
+
</ins><span class="cx"> if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
</span><span class="cx"> require_once (WP_CONTENT_DIR . '/object-cache.php');
</span><span class="cx"> $_wp_using_ext_object_cache = true;
</span><span class="lines">@@ -388,6 +402,11 @@
</span><span class="cx"> require (ABSPATH . WPINC . '/http.php');
</span><span class="cx"> require (ABSPATH . WPINC . '/widgets.php');
</span><span class="cx">
</span><ins>+if ( is_multisite() ) {
+ require_once( ABSPATH . WPINC . '/ms-functions.php' );
+ require_once( ABSPATH . WPINC . '/ms-default-filters.php' );
+}
+
</ins><span class="cx"> if ( !defined('WP_CONTENT_URL') )
</span><span class="cx"> define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>