Changeset 12609

Timestamp:

01/06/2010 08:19:35 PM (15 years ago)

Author:

ryan

Message:

Introduce is_multisite(). see #11644

Location:

trunk

Files:

• wp-admin/ms-admin.php (modified) (2 diffs)
• wp-admin/ms-edit.php (modified) (1 diff)
• wp-admin/ms-options.php (modified) (1 diff)
• wp-admin/ms-sites.php (modified) (1 diff)
• wp-admin/ms-upgrade-site.php (modified) (2 diffs)
• wp-admin/ms-users.php (modified) (1 diff)
• wp-settings.php (modified) (2 diffs)

trunk/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');
@@ -12 +15 @@
 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.') );
 }

trunk/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.') );

trunk/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';

trunk/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');

trunk/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' );
 
@@ -7 +11 @@
 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.') );
 }

trunk/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');

trunk/wp-settings.php

@@ -321 +321 @@
     if ( defined('WP_ADMIN') )
         return WP_ADMIN;
+    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;
 }
@@ -389 +403 @@
 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