Changeset 1401

Timestamp:

06/10/2004 08:42:25 AM (22 years ago)

Author:

saxmatt

Message:

Changes to options system and query improvements.

Location:

trunk

Files:

• wp-admin/upgrade-functions.php (modified) (1 diff)
• wp-blog-header.php (modified) (1 diff)
• wp-includes/functions.php (modified) (5 diffs)
• wp-settings.php (modified) (2 diffs)

trunk/wp-admin/upgrade-functions.php

@@ -842 +842 @@
         $wpdb->query("INSERT INTO $wpdb->options (option_name, option_type, option_value, option_description, option_admin_level) VALUES('default_email_category', 1, '1', 'by default posts by email will have this category', 8)");
     }
+
+        if(!$wpdb->get_var("SELECT option_id FROM $wpdb->options WHERE option_name = 'recently_edited'")) {
+        $wpdb->query("INSERT INTO $wpdb->options (option_name, option_type, option_value, option_admin_level) VALUES ('recently_edited', 3, '', 8)");
+    }
+
+        maybe_add_column($wpdb->options, 'autoload', "ALTER TABLE `$wpdb->options` ADD `autoload` ENUM( 'yes', 'no' ) NOT NULL ;");
+
+        // Set up a few options not to load by default
+        $fatoptions = array( 'moderation_keys', 'recently_edited' );
+        foreach ($fatoptions as $fatoption) :
+                $wpdb->query("UPDATE $wpdb->options SET `autoload` = 'no' WHERE option_name = '$fatoption'");
+        endforeach;
 }
 

trunk/wp-blog-header.php

@@ -149 +149 @@
 
 // Update some caches.
-update_user_cache();
 update_category_cache();
 

trunk/wp-includes/functions.php

@@ -189 +189 @@
 function get_userdatabylogin($user_login) {
         global $cache_userdata, $wpdb;
-        if ( empty($cache_userdata["$user_login"]) ) {
+        if ( !empty($user_login) && empty($cache_userdata["$user_login"]) ) {
                 $user = $wpdb->get_row("SELECT * FROM $wpdb->users WHERE user_login = '$user_login'");
                 $cache_userdata["$user_login"] = $user;
@@ -200 +200 @@
 function get_userid($user_login) {
         global $cache_userdata, $wpdb;
-        if ( empty($cache_userdata["$user_login"]) ) {
+        if ( !empty($user_login) && empty($cache_userdata["$user_login"]) ) {
                 $user_id = $wpdb->get_var("SELECT ID FROM $wpdb->users WHERE user_login = '$user_login'");
 
@@ -301 +301 @@
 function get_settings($setting) {
         global $wpdb, $cache_settings;
-        if (strstr($_SERVER['REQUEST_URI'], 'install.php')) {
+        if ( strstr($_SERVER['REQUEST_URI'], 'install.php') || strstr($_SERVER['REQUEST_URI'], 'upgrade.php') ) {
                 return false;
         }
 
-        if ( (empty($cache_settings)) ) {
-                $settings = get_alloptions();
-                $cache_settings = $settings;
+        if ( empty($cache_settings) ) {
+                $cache_settings = get_alloptions();
+        }
+
+        if ('home' == $setting && '' == $cache_settings->home) return $cache_settings->siteurl;
+
+        if (!isset($cache_settings->$setting)) {
+                return $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
         } else {
-                $settings = $cache_settings;
-        }
-
-        if ('home' == $setting && '' == $settings->home) return $settings->siteurl;
-
-        if (!isset($settings->$setting)) {
-                return false;
-        } else {
-                return stripslashes($settings->$setting);
+                return $cache_settings->$setting;
         }
 }
@@ -323 +320 @@
 function get_alloptions() {
         global $wpdb;
-        $options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
-        if ($options) {
+        if ($options = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'")) {
                 foreach ($options as $option) {
                         // "When trying to design a foolproof system, 
-                        //  never underestimate the ingenuity of the fools :)"
+                        //  never underestimate the ingenuity of the fools :)" -- Dougal
                         if ('siteurl' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
                         if ('home' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
                         if ('category_base' == $option->option_name) $option->option_value = preg_replace('|/+$|', '', $option->option_value);
 
-                        $all_options->{$option->option_name} = $option->option_value;
+                        $all_options->{$option->option_name} = stripslashes($option->option_value);
                 }
         }
@@ -1812 +1808 @@
     global $cache_userdata, $wpdb;
 
-    $users = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE user_level > 0");
-    foreach ($users as $user) {
-        $cache_userdata[$user->ID] = $user;
-    }
+    if ( $users = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE user_level > 0") ) :
+                foreach ($users as $user) :
+                        $cache_userdata[$user->ID] = $user;
+                endforeach;
+                return true;
+        else: 
+                return false;
+        endif;
 }
 

trunk/wp-settings.php

@@ -48 +48 @@
 
 
-$wpdb->hide_errors();
-$users = $wpdb->get_results("SELECT * FROM $wpdb->users");
-if ( !$users && !strstr($_SERVER['PHP_SELF'], 'install.php') )
-        die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
-$wpdb->show_errors();
-
 require (ABSPATH . WPINC . '/functions.php');
 require (ABSPATH . WPINC . '/functions-formatting.php');
@@ -60 +54 @@
 require (ABSPATH . WPINC . '/kses.php');
 require_once (ABSPATH . WPINC . '/wp-l10n.php');
+
+$wpdb->hide_errors();
+if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') )
+        die("It doesn't look like you've installed WP yet. Try running <a href='wp-admin/install.php'>install.php</a>.");
+$wpdb->show_errors();
 
 if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) {