Changeset 12755 for trunk/wp-includes/load.php

Timestamp:

01/18/2010 11:34:36 PM (15 years ago)

Author:

ryan

Message:

Multisite and formatting cleanups. Introduce get_allowed_themes(). see #11644

File:

• trunk/wp-includes/load.php (modified) (3 diffs)

trunk/wp-includes/load.php

@@ -261 +261 @@
 
     wp_cache_init();
+
     if ( function_exists('wp_cache_add_global_groups') ) {
-            if( is_multisite() ) {
-                    wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
-            } else {
-                wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient'));
-            }
+        wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss'));
         wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
     }
@@ -273 +270 @@
 function wp_not_installed() {
     if ( is_multisite() ) {
-            if ( !is_blog_installed() && !defined('WP_INSTALLING') )
-                    die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here ~ Mark
+        if ( !is_blog_installed() && !defined('WP_INSTALLING') )
+            die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here
     } elseif ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
         if ( defined('WP_SITEURL') )
@@ -294 +291 @@
         if ( $dh = opendir( WPMU_PLUGIN_DIR ) ) {
             $mu_plugins = array ();
-            while ( ( $plugin = readdir( $dh ) ) !== false )
+            while ( ( $plugin = readdir( $dh ) ) !== false ) {
                 if ( substr( $plugin, -4 ) == '.php' )
                     $mu_plugins[] = $plugin;
+            }
             closedir( $dh );
-                    if( is_multisite() )
-                    sort( $mu_plugins );
-            foreach( $mu_plugins as $mu_plugin )
+            sort( $mu_plugins );
+            foreach ( $mu_plugins as $mu_plugin )
                 include_once( WPMU_PLUGIN_DIR . '/' . $mu_plugin );
         }