Changeset 10958

Timestamp:

04/16/2009 10:00:39 PM (16 years ago)

Author:

ryan

Message:

Optimize install check by checking alloptions cache before doing a separate query. Props joostdevalk. fixes #8947

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1680 +1680 @@
 
     $suppress = $wpdb->suppress_errors();
-    $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+    $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 )
+        $installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+    else 
+        $installed = $alloptions['siteurl'];
     $wpdb->suppress_errors($suppress);