Changeset 12755 for trunk/wp-includes/load.php
- Timestamp:
- 01/18/2010 11:34:36 PM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-includes/load.php
r12734 r12755 261 261 262 262 wp_cache_init(); 263 263 264 if ( function_exists('wp_cache_add_global_groups') ) { 264 if( is_multisite() ) { 265 wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss')); 266 } else { 267 wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient')); 268 } 265 wp_cache_add_global_groups(array ('users', 'userlogins', 'usermeta', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'rss')); 269 266 wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' )); 270 267 } … … 273 270 function wp_not_installed() { 274 271 if ( is_multisite() ) { 275 276 die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here ~ Mark272 if ( !is_blog_installed() && !defined('WP_INSTALLING') ) 273 die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here 277 274 } elseif ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) { 278 275 if ( defined('WP_SITEURL') ) … … 294 291 if ( $dh = opendir( WPMU_PLUGIN_DIR ) ) { 295 292 $mu_plugins = array (); 296 while ( ( $plugin = readdir( $dh ) ) !== false ) 293 while ( ( $plugin = readdir( $dh ) ) !== false ) { 297 294 if ( substr( $plugin, -4 ) == '.php' ) 298 295 $mu_plugins[] = $plugin; 296 } 299 297 closedir( $dh ); 300 if( is_multisite() ) 301 sort( $mu_plugins ); 302 foreach( $mu_plugins as $mu_plugin ) 298 sort( $mu_plugins ); 299 foreach ( $mu_plugins as $mu_plugin ) 303 300 include_once( WPMU_PLUGIN_DIR . '/' . $mu_plugin ); 304 301 }
Note: See TracChangeset
for help on using the changeset viewer.