Changeset 14198

Timestamp:

04/23/2010 04:18:33 PM (15 years ago)

Author:

ryan

Message:

Move ms_site_check() to after init and allow super admins to view blocked sites. see #13094

Location:

trunk

Files:

• wp-includes/ms-load.php (modified) (1 diff)
• wp-settings.php (modified) (2 diffs)

trunk/wp-includes/ms-load.php

@@ -38 +38 @@
 function ms_site_check() {
     global $wpdb, $current_blog;
+
+    // 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;
 
     if ( '1' == $current_blog->deleted ) {

trunk/wp-settings.php

@@ -154 +154 @@
 do_action( 'muplugins_loaded' );
 
-// Check site status if multisite.
+if ( is_multisite() )
+    ms_cookie_constants(  );
+
+// Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
+wp_cookie_constants( );
+
+// Define and enforce our SSL constants
+wp_ssl_constants( );
+
+// Create common globals.
+require( ABSPATH . WPINC . '/vars.php' );
+
+// Make taxonomies and posts available to plugins and themes.
+// @plugin authors: warning: these get registered again on the init hook.
+create_initial_taxonomies();
+create_initial_post_types();
+
+// Load active plugins.
+foreach ( wp_get_active_and_valid_plugins() as $plugin )
+    include_once( $plugin );
+unset( $plugin );
+
+// Load pluggable functions.
+require( ABSPATH . WPINC . '/pluggable.php' );
+require( ABSPATH . WPINC . '/pluggable-deprecated.php' );
+
+// Set internal encoding.
+wp_set_internal_encoding();
+
+// Run wp_cache_postload() if object cache is enabled and the function exists.
+if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
+    wp_cache_postload();
+
+do_action( 'plugins_loaded' );
+
+// Define constants which affect functionality if not already defined.
+wp_functionality_constants( );
+
+// Add magic quotes and set up $_REQUEST ( $_GET + $_POST )
+wp_magic_quotes();
+
+do_action( 'sanitize_comment_cookies' );
+
+/**
+ * WordPress Query object
+ * @global object $wp_the_query
+ * @since 2.0.0
+ */
+$wp_the_query =& new WP_Query();
+
+/**
+ * Holds the reference to @see $wp_the_query
+ * Use this global for WordPress queries
+ * @global object $wp_query
+ * @since 1.5.0
+ */
+$wp_query =& $wp_the_query;
+
+/**
+ * Holds the WordPress Rewrite object for creating pretty URLs
+ * @global object $wp_rewrite
+ * @since 1.5.0
+ */
+$wp_rewrite =& new WP_Rewrite();
+
+/**
+ * WordPress Object
+ * @global object $wp
+ * @since 2.0.0
+ */
+$wp =& new WP();
+
+/**
+ * WordPress Widget Factory Object
+ * @global object $wp_widget_factory
+ * @since 2.8.0
+ */
+$wp_widget_factory =& new WP_Widget_Factory();
+
+do_action( 'setup_theme' );
+
+// Define the template related constants.
+wp_templating_constants(  );
+
+// Load the default text localization domain.
+load_default_textdomain();
+
+// Find the blog locale.
+$locale = get_locale();
+$locale_file = WP_LANG_DIR . "/$locale.php";
+if ( is_readable( $locale_file ) )
+    require( $locale_file );
+unset($locale_file);
+
+// Pull in locale data after loading text domain.
+require( ABSPATH . WPINC . '/locale.php' );
+
+/**
+ * WordPress Locale object for loading locale domain date and various strings.
+ * @global object $wp_locale
+ * @since 2.1.0
+ */
+$wp_locale =& new WP_Locale();
+
+// Load the functions for the active theme, for both parent and child theme if applicable.
+if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
+    include( STYLESHEETPATH . '/functions.php' );
+if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
+    include( TEMPLATEPATH . '/functions.php' );
+
+do_action( 'after_setup_theme' );
+
+// Load any template functions the theme supports.
+require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
+
+register_shutdown_function( 'shutdown_action_hook' );
+
+// Set up current user.
+$wp->init();
+
+/**
+ * Most of WP is loaded at this stage, and the user is authenticated. WP continues
+ * to load on the init hook that follows (e.g. widgets), and many plugins instantiate
+ * themselves on it for all sorts of reasons (e.g. they need a user, a taxonomy, etc.).
+ *
+ * If you wish to plug an action once WP is loaded, use the wp_loaded hook below.
+ */
+do_action( 'init' );
+
+// Check site status
 if ( is_multisite() ) {
     if ( true !== ( $file = ms_site_check() ) ) {
@@ -161 +290 @@
     }
     unset($file);
-
-    ms_cookie_constants(  );
 }
-
-// Define constants after multisite is loaded. Cookie-related constants may be overridden in ms_network_cookies().
-wp_cookie_constants( );
-
-// Define and enforce our SSL constants
-wp_ssl_constants( );
-
-// Create common globals.
-require( ABSPATH . WPINC . '/vars.php' );
-
-// Make taxonomies and posts available to plugins and themes.
-// @plugin authors: warning: these get registered again on the init hook.
-create_initial_taxonomies();
-create_initial_post_types();
-
-// Load active plugins.
-foreach ( wp_get_active_and_valid_plugins() as $plugin )
-    include_once( $plugin );
-unset( $plugin );
-
-// Load pluggable functions.
-require( ABSPATH . WPINC . '/pluggable.php' );
-require( ABSPATH . WPINC . '/pluggable-deprecated.php' );
-
-// Set internal encoding.
-wp_set_internal_encoding();
-
-// Run wp_cache_postload() if object cache is enabled and the function exists.
-if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
-    wp_cache_postload();
-
-do_action( 'plugins_loaded' );
-
-// Define constants which affect functionality if not already defined.
-wp_functionality_constants( );
-
-// Add magic quotes and set up $_REQUEST ( $_GET + $_POST )
-wp_magic_quotes();
-
-do_action( 'sanitize_comment_cookies' );
-
-/**
- * WordPress Query object
- * @global object $wp_the_query
- * @since 2.0.0
- */
-$wp_the_query =& new WP_Query();
-
-/**
- * Holds the reference to @see $wp_the_query
- * Use this global for WordPress queries
- * @global object $wp_query
- * @since 1.5.0
- */
-$wp_query =& $wp_the_query;
-
-/**
- * Holds the WordPress Rewrite object for creating pretty URLs
- * @global object $wp_rewrite
- * @since 1.5.0
- */
-$wp_rewrite =& new WP_Rewrite();
-
-/**
- * WordPress Object
- * @global object $wp
- * @since 2.0.0
- */
-$wp =& new WP();
-
-/**
- * WordPress Widget Factory Object
- * @global object $wp_widget_factory
- * @since 2.8.0
- */
-$wp_widget_factory =& new WP_Widget_Factory();
-
-do_action( 'setup_theme' );
-
-// Define the template related constants.
-wp_templating_constants(  );
-
-// Load the default text localization domain.
-load_default_textdomain();
-
-// Find the blog locale.
-$locale = get_locale();
-$locale_file = WP_LANG_DIR . "/$locale.php";
-if ( is_readable( $locale_file ) )
-    require( $locale_file );
-unset($locale_file);
-
-// Pull in locale data after loading text domain.
-require( ABSPATH . WPINC . '/locale.php' );
-
-/**
- * WordPress Locale object for loading locale domain date and various strings.
- * @global object $wp_locale
- * @since 2.1.0
- */
-$wp_locale =& new WP_Locale();
-
-// Load the functions for the active theme, for both parent and child theme if applicable.
-if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
-    include( STYLESHEETPATH . '/functions.php' );
-if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
-    include( TEMPLATEPATH . '/functions.php' );
-
-do_action( 'after_setup_theme' );
-
-// Load any template functions the theme supports.
-require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );
-
-register_shutdown_function( 'shutdown_action_hook' );
-
-// Set up current user.
-$wp->init();
-
-/**
- * Most of WP is loaded at this stage, and the user is authenticated. WP continues
- * to load on the init hook that follows (e.g. widgets), and many plugins instantiate
- * themselves on it for all sorts of reasons (e.g. they need a user, a taxonomy, etc.).
- *
- * If you wish to plug an action once WP is loaded, use the wp_loaded hook below.
- */
-do_action( 'init' );
 
 /**