diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:45:26 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:45:26 +0000 |
| commit | 767c3538b9f4aa2684429a7efea8f7728034c754 (patch) | |
| tree | 8cc7b4bc82bfc8e5cc2179b7a8aa7b4f9a2be193 /wp-includes/classes.php | |
| parent | 23c0a299ada091cdeece968ad5cd3bdd20f5ef3c (diff) | |
| download | wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.tar.gz wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.tar.xz wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.zip | |
WP Merge to rev 4347
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@789 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/classes.php')
| -rw-r--r-- | wp-includes/classes.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/wp-includes/classes.php b/wp-includes/classes.php index 6d5fec7..aa19f3c 100644 --- a/wp-includes/classes.php +++ b/wp-includes/classes.php @@ -171,6 +171,8 @@ class WP { nocache_headers(); if ( !empty($this->query_vars['error']) && '404' == $this->query_vars['error'] ) { status_header( 404 ); + if ( !is_user_logged_in() ) + nocache_headers(); @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')); @@ -260,6 +262,7 @@ class WP { if ( (0 == count($wp_query->posts)) && !is_404() && !is_search() && ( $this->did_permalink || (!empty($_SERVER['QUERY_STRING']) && (false === strpos($_SERVER['REQUEST_URI'], '?'))) ) ) { $wp_query->set_404(); status_header( 404 ); + nocache_headers(); } elseif( is_404() != true ) { status_header( 200 ); } |