WordPress.org

Make WordPress Core


Ignore:
Timestamp:
01/18/2010 11:34:36 PM (10 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/load.php

    r12734 r12755  
    261261
    262262    wp_cache_init();
     263
    263264    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'));
    269266        wp_cache_add_non_persistent_groups(array( 'comment', 'counts', 'plugins' ));
    270267    }
     
    273270function wp_not_installed() {
    274271    if ( is_multisite() ) {
    275             if ( !is_blog_installed() && !defined('WP_INSTALLING') )
    276                     die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) ); // have to die here ~ Mark
     272        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
    277274    } elseif ( !is_blog_installed() && (strpos($_SERVER['PHP_SELF'], 'install.php') === false && !defined('WP_INSTALLING')) ) {
    278275        if ( defined('WP_SITEURL') )
     
    294291        if ( $dh = opendir( WPMU_PLUGIN_DIR ) ) {
    295292            $mu_plugins = array ();
    296             while ( ( $plugin = readdir( $dh ) ) !== false )
     293            while ( ( $plugin = readdir( $dh ) ) !== false ) {
    297294                if ( substr( $plugin, -4 ) == '.php' )
    298295                    $mu_plugins[] = $plugin;
     296            }
    299297            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 )
    303300                include_once( WPMU_PLUGIN_DIR . '/' . $mu_plugin );
    304301        }
Note: See TracChangeset for help on using the changeset viewer.