WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up is_blog_installed(), remove redundant or unnecessary code. see #8947 

git-svn-id: http://svn.automattic.com/wordpress/trunk@10974 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
markjaquith 2009-04-17 01:43:53 +00:00
parent 14bd87615e
commit 9f5a39d759
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-includes/functions.php
View File

@ -1675,20 +1675,20 @@ function is_blog_installed() {
global $wpdb;
// Check cache first. If options table goes away and we have true cached, oh well.
if ( wp_cache_get('is_blog_installed') )
if ( wp_cache_get( 'is_blog_installed' ) )
return true;
$suppress = $wpdb->suppress_errors();
$alloptions = wp_load_alloptions();
// If siteurl is not set to autoload, but other options are loaded, check if it's there
if ( !isset($alloptions['siteurl']) && count($alloptions) > 1 )
// If siteurl is not set to autoload, check it specifically
if ( !isset( $alloptions['siteurl'] ) )
$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
else
$installed = $alloptions['siteurl'];
$wpdb->suppress_errors($suppress);
$wpdb->suppress_errors( $suppress );
$installed = !empty( $installed ) ? true : false;
wp_cache_set('is_blog_installed', $installed);
$installed = !empty( $installed );
wp_cache_set( 'is_blog_installed', $installed );
return $installed;
}