diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-15 12:50:53 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-08-15 12:50:53 +0000 |
commit | 62a85df302a839177400100c6a09813161440ce0 (patch) | |
tree | 1ab9ca1d6a48defe1d6b8cfff402a0ccf23eca7e /wp-includes/query.php | |
parent | 69a120282949dc8a5526a7486751bc07aea44d9d (diff) | |
download | wordpress-mu-62a85df302a839177400100c6a09813161440ce0.tar.gz wordpress-mu-62a85df302a839177400100c6a09813161440ce0.tar.xz wordpress-mu-62a85df302a839177400100c6a09813161440ce0.zip |
WP Merge to rev 4096
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@722 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/query.php')
-rw-r--r-- | wp-includes/query.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/wp-includes/query.php b/wp-includes/query.php index f160173..f94c79f 100644 --- a/wp-includes/query.php +++ b/wp-includes/query.php @@ -489,8 +489,12 @@ class WP_Query { }
function set_404() {
+ $is_feed = $this->is_feed;
+
$this->init_query_flags();
$this->is_404 = true;
+
+ $this->is_feed = $is_feed;
}
function get($query_var) {
|