Changeset 3025

Timestamp:

11/09/2005 09:01:24 PM (19 years ago)

Author:

matt

Message:

Missing semi, also fixes #1599

File:

• trunk/wp-includes/functions.php (modified) (17 diffs)

trunk/wp-includes/functions.php

@@ -261 +261 @@
 
 function get_settings($setting) {
-    global $wpdb;
+    global $wpdb, $cache_settings, $cache_nonexistantoptions;
     if ( strstr($_SERVER['REQUEST_URI'], 'wp-admin/install.php') || defined('WP_INSTALLING') )
         return false;
 
-    $value = wp_cache_get($setting, 'options');
-
-    if ( false === $value ) {
-        $value = $wpdb->get_row("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
-        if( is_object( $value ) ) {
-            $value = $value->option_value;
-            wp_cache_set($setting, $value, 'options');
-        }
-    }
-
-    // If home is not set use siteurl.
-    if ( 'home' == $setting && '' == $value )
-        return get_settings('siteurl');
-
-    if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
-        $value = preg_replace('|/+$|', '', $value);
-
-    @ $kellogs = unserialize($value);
-    if ( $kellogs !== FALSE )
-        return apply_filters('option_' . $setting, $kellogs);
-    else
-        return apply_filters('option_' . $setting, $value);
+    if ( empty($cache_settings) )
+        $cache_settings = get_alloptions();
+
+    if ( empty($cache_nonexistantoptions) )
+        $cache_nonexistantoptions = array();
+
+    if ( 'home' == $setting && '' == $cache_settings->home )
+        return apply_filters('option_' . $setting, $cache_settings->siteurl);
+
+    if ( isset($cache_settings->$setting) ) :
+        return apply_filters('option_' . $setting, $cache_settings->$setting);
+    else :
+        // for these cases when we're asking for an unknown option
+        if ( isset($cache_nonexistantoptions[$setting]) )
+            return false;
+
+        $option = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = '$setting'");
+
+        if (!$option) :
+            $cache_nonexistantoptions[$setting] = true;
+            return false;
+        endif;
+
+        @ $kellogs = unserialize($option);
+        if ( $kellogs !== FALSE )
+            return apply_filters('option_' . $setting, $kellogs);
+        else return apply_filters('option_' . $setting, $option);
+    endif;
 }
 
@@ -333 +339 @@
 
 function update_option($option_name, $newvalue) {
-    global $wpdb;
+    global $wpdb, $cache_settings;
 
     if ( is_string($newvalue) )
@@ -347 +353 @@
     // If it's not there add it
     if ( !$wpdb->get_var("SELECT option_name FROM $wpdb->options WHERE option_name = '$option_name'") )
-        add_option($option_name, $newvalue);
-
-    wp_cache_set($option_name, $newvalue, 'options');
+        add_option($option_name);
 
     $newvalue = $wpdb->escape($newvalue);
-    $option_name = $wpdb->escape($option_name);
+    $option_name = $wpdb->escape( $option_name );
     $wpdb->query("UPDATE $wpdb->options SET option_value = '$newvalue' WHERE option_name = '$option_name'");
+    $cache_settings = get_alloptions(); // Re cache settings
     return true;
 }
@@ -366 +371 @@
 // thx Alex Stapleton, http://alex.vort-x.net/blog/
 function add_option($name, $value = '', $description = '', $autoload = 'yes') {
-    global $wpdb;
+    global $wpdb, $cache_settings;
 
     // Make sure the option doesn't already exist
-    if ( false !== get_option($name) )
+    if ( isset($cache_settings->$name) )
         return;
 
@@ -376 +381 @@
         $value = serialize($value);
 
-    wp_cache_set($name, $value, 'options');
-
-    $name = $wpdb->escape($name);
-    $value = $wpdb->escape($value);
-    $description = $wpdb->escape($description);
-    $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, option_description, autoload) VALUES ('$name', '$value', '$description', '$autoload')");
-
+    if ( !$wpdb->get_var("SELECT option_name FROM $wpdb->options WHERE option_name = '$name'") ) {
+        $name = $wpdb->escape($name);
+        $value = $wpdb->escape($value);
+        $description = $wpdb->escape($description);
+        $wpdb->query("INSERT INTO $wpdb->options (option_name, option_value, option_description, autoload) VALUES ('$name', '$value', '$description', '$autoload')");
+
+        if ( $wpdb->insert_id ) {
+            global $cache_settings;
+            $cache_settings->{$name} = $original;
+        }
+    }
     return;
 }
@@ -392 +401 @@
     if ( !$option_id ) return false;
     $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = '$name'");
-    wp_cache_delete($name, 'options');
     return true;
 }
@@ -561 +569 @@
             $_post = & $post_cache[$post];
         else {
-            $query = "SELECT * FROM $wpdb->posts WHERE ID = '$post' LIMIT 1";
+            $query = "SELECT * FROM $wpdb->posts WHERE ID = '$post'";
             $post_cache[$post] = & $wpdb->get_row($query);
             $_post = & $post_cache[$post];
@@ -581 +589 @@
 // Handles page caching.
 function &get_page(&$page, $output = OBJECT) {
-    global $wpdb;
+    global $page_cache, $wpdb;
 
     if ( empty($page) ) {
-        if ( isset($GLOBALS['page']) ) {
+        if ( isset($GLOBALS['page']) )
             $_page = & $GLOBALS['page'];
-            wp_cache_add($_page->ID, $_page, 'pages');
-        } else {
+        else
             $_page = null;
-        }
     } elseif ( is_object($page) ) {
-        wp_cache_add($page->ID, $page, 'pages');
-        $_page = $page;
-    } else {
-        if ( isset($GLOBALS['page']) && ($page == $GLOBALS['page']->ID) ) {
+        if ( !isset($page_cache[$page->ID]) )
+            $page_cache[$page->ID] = &$page;
+        $_page = & $page_cache[$page->ID];
+    } else {
+        if ( isset($GLOBALS['page']) && ($page == $GLOBALS['page']->ID) )
             $_page = & $GLOBALS['page'];
-            wp_cache_add($_page->ID, $_page, 'pages');
-        } elseif ( $_page = wp_cache_get($page, 'pages') ) {
-            // Got it.
-        } else {
-            $query = "SELECT * FROM $wpdb->posts WHERE ID= '$page' LIMIT 1";
-            $_page = & $wpdb->get_row($query);
-            wp_cache_add($_page->ID, $_page, 'pages');
+        elseif ( isset($page_cache[$page]) )
+            $_page = & $page_cache[$page];
+        else {
+            $query = "SELECT * FROM $wpdb->posts WHERE ID= '$page'";
+            $page_cache[$page] = & $wpdb->get_row($query);
+            $_page = & $page_cache[$page];
         }
     }
@@ -617 +623 @@
 }
 
-function set_category_path($cat) {
-    $cat->fullpath = '/' . $cat->category_nicename;
-    $path = $cat->fullpath;
-    $curcat = $cat;
-    while ($curcat->category_parent != 0) {
-        $curcat = get_category($curcat->category_parent);
-        $path = '/' . $curcat->category_nicename . $path;
-    }
-    
-    $cat->fullpath = $path;
-
-    return $cat;
-}
-
 // Retrieves category data given a category ID or category object.
 // Handles category caching.
 function &get_category(&$category, $output = OBJECT) {
-    global $wpdb;
+    global $cache_categories, $wpdb;
 
     if ( empty($category) )
         return null;
 
+    if ( !isset($cache_categories) )
+        update_category_cache();
+
     if ( is_object($category) ) {
-        wp_cache_add($category->cat_ID, $category, 'category');
-        $_category = $category;
-    } else {
-        if ( ! $_category = wp_cache_get($category, 'category') ) {
-            $_category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$category' LIMIT 1");
-            wp_cache_add($category, $_category, 'category');
-        }
-    }
-
-    if ( !isset($_category->fullpath) ) {
-        $_category = set_category_path($_category);
-        wp_cache_replace($_category->cat_ID, $_category, 'category');   
+        if ( !isset($cache_categories[$category->cat_ID]) )
+            $cache_categories[$category->cat_ID] = &$category;
+        $_category = & $cache_categories[$category->cat_ID];
+    } else {
+        if ( !isset($cache_categories[$category]) ) {
+            $_category = $wpdb->get_row("SELECT * FROM $wpdb->categories WHERE cat_ID = '$category'");
+            $cache_categories[$category->cat_ID] = & $_category;
+        } else {
+            $_category = & $cache_categories[$category];
+        }
     }
 
@@ -679 +672 @@
     } else {
         if ( !isset($comment_cache[$comment]) ) {
-            $_comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment' LIMIT 1");
+            $_comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment'");
             $comment_cache[$comment->comment_ID] = & $_comment;
         } else {
@@ -700 +693 @@
     $category = &get_category($cat_ID);
     return $category->cat_name;
-}
-
-function get_all_category_ids() {
-    global $wpdb;
-    
-    if ( ! $cat_ids = wp_cache_get('all_category_ids', 'category') ) {
-        $cat_ids = $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories");
-        wp_cache_add('all_category_ids', $cat_ids, 'category');
-    }
-    
-    return $cat_ids;
 }
 
@@ -1250 +1232 @@
     for ($i = 0; $i < count($pages); $i++) {
         $page_cache[$pages[$i]->ID] = &$pages[$i];
-        wp_cache_add($pages[$i]->ID, $pages[$i], 'pages');
     }
 }
@@ -1263 +1244 @@
 
 function update_post_category_cache($post_ids) {
-    global $wpdb, $category_cache;
+    global $wpdb, $category_cache, $cache_categories;
 
     if ( empty($post_ids) )
@@ -1275 +1256 @@
     WHERE category_id = cat_ID AND post_id IN ($post_ids)");
 
-    if ( empty($dogs) )
-        return;
-        
-    foreach ($dogs as $catt)
-        $category_cache[$catt->post_id][$catt->cat_ID] = &get_category($catt->cat_ID);
+    if ( !isset($cache_categories) )
+        update_category_cache();
+
+    if ( !empty($dogs) ) {
+        foreach ($dogs as $catt) {
+            $category_cache[$catt->post_id][$catt->cat_ID] = &$cache_categories[$catt->cat_ID];
+        }
+    }
 }
 
@@ -1339 +1323 @@
 
 function update_category_cache() {
-    return true;
+    global $cache_categories, $wpdb;
+    if ( $dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories") ):
+        foreach ($dogs as $catt)
+            $cache_categories[$catt->cat_ID] = $catt;
+
+        foreach ($cache_categories as $catt) {
+            $curcat = $catt->cat_ID;
+            $cache_categories[$catt->cat_ID]->fullpath = '/' . $cache_categories[$catt->cat_ID]->category_nicename;
+            while ($cache_categories[$curcat]->category_parent != 0) {
+                $curcat = $cache_categories[$curcat]->category_parent;
+                $cache_categories[$catt->cat_ID]->fullpath = '/' . $cache_categories[$curcat]->category_nicename . $cache_categories[$catt->cat_ID]->fullpath;
+            } 
+        }
+        return true;
+    else :
+        return false;
+    endif;
+}
+
+function clean_user_cache($id) {
+    global $cache_userdata;
+
+    if ( isset( $cache_userdata[$id] ) )
+        unset( $cache_userdata[$id] );
 }
 
@@ -2117 +2124 @@
     if ( $cur->meta_value != $meta_value )
         $wpdb->query("UPDATE $wpdb->usermeta SET meta_value = '$meta_value' WHERE user_id = '$user_id' AND meta_key = '$meta_key'");
-
-    wp_cache_delete($user_id, 'users');
-    // FIXME: Need to delete username keyed cache object.
 }
 
@@ -2135 +2139 @@
 
 function plugin_basename($file) {
-    $file = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file)
+    $file = preg_replace('/^.*wp-content[\\\\\/]plugins[\\\\\/]/', '', $file);
     $file = stripslashes($file);
     return $file;