diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-24 17:36:34 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-24 17:36:34 +0000 |
| commit | 1a657f56fdbef804018793a41ec5b076cba604e7 (patch) | |
| tree | 6d2a0fea52e76d055ceb3a90c438dcabe1a73919 /wp-includes/functions.php | |
| parent | 631c9bb4d60d242432052f56c00768392f42a392 (diff) | |
| download | wordpress-mu-1a657f56fdbef804018793a41ec5b076cba604e7.tar.gz wordpress-mu-1a657f56fdbef804018793a41ec5b076cba604e7.tar.xz wordpress-mu-1a657f56fdbef804018793a41ec5b076cba604e7.zip | |
Ignore the cache with WP_INSTALLING is set
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1337 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/functions.php')
| -rw-r--r-- | wp-includes/functions.php | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php index 6b083c3..bcf0b79 100644 --- a/wp-includes/functions.php +++ b/wp-includes/functions.php @@ -371,17 +371,19 @@ function wp_load_alloptions() { global $_wp_alloptions; global $blog_id; - if ( !empty($_wp_alloptions[$blog_id]) ) - return $_wp_alloptions[$blog_id]; + if( !defined( 'WP_INSTALLING' ) ) { + if ( !empty($_wp_alloptions[$blog_id]) ) + return $_wp_alloptions[$blog_id]; - $alloptions = wp_cache_get('alloptions', 'options'); + $alloptions = wp_cache_get('alloptions', 'options'); - if ( false !== $alloptions ) { - $_wp_alloptions[$blog_id] = $alloptions; - return $alloptions; - } + if ( false !== $alloptions ) { + $_wp_alloptions[$blog_id] = $alloptions; + return $alloptions; + } - $_wp_alloptions[$blog_id] = array(); + $_wp_alloptions[$blog_id] = array(); + } $suppress = $wpdb->suppress_errors(); if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) ) @@ -399,9 +401,6 @@ function _get_option_cache( $setting ) { global $_wp_alloptions; global $blog_id; - if( defined( 'WP_INSTALLING' ) ) - return false; - wp_load_alloptions(); if ( isset($_wp_alloptions[$blog_id][$setting]) ) |