diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-31 11:20:07 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-31 11:20:07 +0000 |
| commit | 47bbd1a907d44da6e2a68aef7d03f725c5b16111 (patch) | |
| tree | 6e3b054584145142576ebaa26cca9f6e878ec78f | |
| parent | 2af62b45328bed8acc4c2484964722eed237c665 (diff) | |
| download | wordpress-mu-47bbd1a907d44da6e2a68aef7d03f725c5b16111.tar.gz wordpress-mu-47bbd1a907d44da6e2a68aef7d03f725c5b16111.tar.xz wordpress-mu-47bbd1a907d44da6e2a68aef7d03f725c5b16111.zip | |
WP Merge to rev 4850
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@875 7be80a69-a1ef-0310-a953-fb0f7c49ff36
| -rw-r--r-- | wp-includes/category.php | 2 | ||||
| -rw-r--r-- | wp-includes/js/tinymce/tiny_mce_gzip.php | 4 | ||||
| -rw-r--r-- | wp-includes/js/tinymce/wp-mce-help.php | 4 | ||||
| -rw-r--r-- | wp-includes/post.php | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/wp-includes/category.php b/wp-includes/category.php index 7fdc334..2ba3d30 100644 --- a/wp-includes/category.php +++ b/wp-includes/category.php @@ -33,7 +33,7 @@ function &get_categories($args = '') { $key = md5( serialize( $r ) ); if ( $cache = wp_cache_get( 'get_categories', 'category' ) ) if ( isset( $cache[ $key ] ) ) - return $cache[ $key ]; + return apply_filters('get_categories', $cache[$key], $r); $where = 'cat_ID > 0'; $inclusions = ''; diff --git a/wp-includes/js/tinymce/tiny_mce_gzip.php b/wp-includes/js/tinymce/tiny_mce_gzip.php index 686fb61..0de8f42 100644 --- a/wp-includes/js/tinymce/tiny_mce_gzip.php +++ b/wp-includes/js/tinymce/tiny_mce_gzip.php @@ -6,7 +6,7 @@ * * @version 1.08 * @author Moxiecode - * @copyright Copyright © 2005-2006, Moxiecode Systems AB, All rights reserved. + * @copyright Copyright 2005-2006, Moxiecode Systems AB, All rights reserved. * * This file compresses the TinyMCE JavaScript using GZip and * enables the browser to do two requests instead of one for each .js file. @@ -82,7 +82,7 @@ $cacheDir = realpath("."); // Absolute directory path to where cached gz file $debug = false; // Enable this option if you need debuging info // Headers -header("Content-type: text/javascript; charset: UTF-8"); +header("Content-Type: text/javascript; charset=" . get_bloginfo('charset')); // header("Cache-Control: must-revalidate"); header("Vary: Accept-Encoding"); // Handle proxies header("Expires: " . gmdate("D, d M Y H:i:s", time() + $expiresOffset) . " GMT"); diff --git a/wp-includes/js/tinymce/wp-mce-help.php b/wp-includes/js/tinymce/wp-mce-help.php index e28132a..fe90b0d 100644 --- a/wp-includes/js/tinymce/wp-mce-help.php +++ b/wp-includes/js/tinymce/wp-mce-help.php @@ -1,4 +1,6 @@ -<?php require_once('../../../wp-config.php'); ?> +<?php require_once('../../../wp-config.php'); +header('Content-Type: text/html; charset=' . get_bloginfo('charset')); +?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>> <head> diff --git a/wp-includes/post.php b/wp-includes/post.php index 52ee45a..0241698 100644 --- a/wp-includes/post.php +++ b/wp-includes/post.php @@ -105,10 +105,10 @@ function &get_post(&$post, $output = OBJECT) { $post_cache[$blog_id][$post->ID] = &$post; $_post = & $post_cache[$blog_id][$post->ID]; } else { - if ( $_post = wp_cache_get($post, 'pages') ) - return get_page($_post, $output); - elseif ( isset($post_cache[$blog_id][$post]) ) + if ( isset($post_cache[$blog_id][$post]) ) $_post = & $post_cache[$blog_id][$post]; + elseif ( $_post = wp_cache_get($post, 'pages') ) + return get_page($_post, $output); else { $query = "SELECT * FROM $wpdb->posts WHERE ID = '$post' LIMIT 1"; $_post = & $wpdb->get_row($query); |