summaryrefslogtreecommitdiffstats
path: root/wp-includes/classes.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-26 15:40:12 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-26 15:40:12 +0000
commita4383a13a1522aa6b9db861b732249d0a3897140 (patch)
treef8e3465a0aa68577fb452ca1a1e020cb1ae49571 /wp-includes/classes.php
parente9274e601b49af6a87b2c79d356910114bbdcfbc (diff)
downloadwordpress-mu-a4383a13a1522aa6b9db861b732249d0a3897140.tar.gz
wordpress-mu-a4383a13a1522aa6b9db861b732249d0a3897140.tar.xz
wordpress-mu-a4383a13a1522aa6b9db861b732249d0a3897140.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@595 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/classes.php')
-rw-r--r--wp-includes/classes.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index a4ecc54..976a727 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -234,6 +234,7 @@ class WP {
nocache_headers();
if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) {
status_header( 404 );
+ @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
} else if ( empty($this->query_vars['feed']) ) {
@header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
} else {