Ticket #11644: 11644.diff

wp-settings.php

@@ -323 +323 @@
         return false;
 }
 
+/**
+ * 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;
+}
+
 if ( file_exists(WP_CONTENT_DIR . '/object-cache.php') ) {
         require_once (WP_CONTENT_DIR . '/object-cache.php');
         $_wp_using_ext_object_cache = true;
@@ -388 +402 @@
 require (ABSPATH . WPINC . '/http.php');
 require (ABSPATH . WPINC . '/widgets.php');
 
+if ( is_multisite() ) {
+        require_once( ABSPATH . WPINC . '/ms-functions.php' );
+        require_once( ABSPATH . WPINC . '/ms-default-filters.php' );
+}
+
 if ( !defined('WP_CONTENT_URL') )
         define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up
 

wp-admin/ms-edit.php

@@ -1 +1 @@
 <?php
 require_once('admin.php');
+
+if ( !is_multisite() )
+        wp_die( __('Multisite support is not enabled.') );
+
 if( is_site_admin() == false ) {
         wp_die( __('You do not have permission to access this page.') );
 }

wp-admin/ms-sites.php

@@ -1 +1 @@
 <?php
 require_once('admin.php');
 
+if ( !is_multisite() )
+        wp_die( __('Multisite support is not enabled.') );
+
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Blogs');
 $parent_file = 'wpmu-admin.php';
 

wp-admin/ms-upgrade-site.php

@@ -1 +1 @@
 <?php
 require_once('admin.php');
+
+if ( !is_multisite() )
+        wp_die( __('Multisite support is not enabled.') );
+
 require_once( ABSPATH . WPINC . '/http.php' );
 
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Upgrade Site');
 $parent_file = 'wpmu-admin.php';
 require_once('admin-header.php');
 
-if( is_site_admin() == false ) {
+if ( is_site_admin() == false ) {
     wp_die( __('You do not have permission to access this page.') );
 }
 

wp-admin/ms-users.php

@@ -1 +1 @@
 <?php
 require_once('admin.php');
 
+if ( !is_multisite() )
+        wp_die( __('Multisite support is not enabled.') );
+
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Users');
 $parent_file = 'wpmu-admin.php';
 

wp-admin/ms-admin.php

@@ -1 +1 @@
 <?php
 require_once('admin.php');
 
+if ( !is_multisite() )
+        wp_die( __('Multisite support is not enabled.') );
+
 $title = __('WordPress MU &rsaquo; Admin');
 $parent_file = 'wpmu-admin.php';
 
@@ -11 +14 @@
 
 require_once('admin-header.php');
 
-if( is_site_admin() == false ) {
+if ( is_site_admin() == false ) {
         wp_die( __('You do not have permission to access this page.') );
 }
 

wp-admin/ms-options.php

@@ -1 +1 @@
 <?php
 require_once('admin.php');
+
+if ( !is_multisite() )
+        wp_die( __('Multisite support is not enabled.') );
+
 $title = __('WordPress MU &rsaquo; Admin &rsaquo; Site Options');
 $parent_file = 'wpmu-admin.php';