More category cache cleanups.

git-svn-id: http://svn.automattic.com/wordpress/trunk@2504 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2005-03-31 05:25:54 +00:00
parent d8ba4fd2ef
commit 74328576c6
2 changed files with 7 additions and 4 deletions

View File

@ -8,10 +8,7 @@ header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
header('Cache-Control: no-cache, must-revalidate, max-age=0'); header('Cache-Control: no-cache, must-revalidate, max-age=0');
header('Pragma: no-cache'); header('Pragma: no-cache');
$dogs = $wpdb->get_results("SELECT * FROM $wpdb->categories"); update_category_cache();
foreach ($dogs as $catt) {
$cache_categories[$catt->cat_ID] = $catt;
}
get_currentuserinfo(); get_currentuserinfo();

View File

@ -615,6 +615,9 @@ function &get_page(&$page, $output = OBJECT) {
function &get_category(&$category, $output = OBJECT) { function &get_category(&$category, $output = OBJECT) {
global $cache_categories, $wpdb; global $cache_categories, $wpdb;
if ( ! isset($cache_categories))
update_category_cache();
if (is_object($category)) { if (is_object($category)) {
if ( ! isset($cache_categories[$category->cat_ID])) if ( ! isset($cache_categories[$category->cat_ID]))
$cache_categories[$category->cat_ID] = &$category; $cache_categories[$category->cat_ID] = &$category;
@ -1170,6 +1173,9 @@ function update_post_category_cache($post_ids) {
post_id, category_id FROM $wpdb->categories, $wpdb->post2cat post_id, category_id FROM $wpdb->categories, $wpdb->post2cat
WHERE category_id = cat_ID AND post_id IN ($post_ids)"); WHERE category_id = cat_ID AND post_id IN ($post_ids)");
if (! isset($cache_categories))
update_category_cache();
if ( !empty($dogs) ) { if ( !empty($dogs) ) {
foreach ($dogs as $catt) { foreach ($dogs as $catt) {
$category_cache[$catt->post_id][$catt->category_id] = &$cache_categories[$catt->category_id]; $category_cache[$catt->post_id][$catt->category_id] = &$cache_categories[$catt->category_id];