From 7dab31bbe50cebc6d5f96e8ff9c4540a6f4f861e Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Wed, 14 Jun 2006 21:49:10 +0000
Subject: [PATCH] Query fix from skeltoac. fixes #2822

git-svn-id: http://svn.automattic.com/wordpress/trunk@3869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/query.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-includes/query.php b/wp-includes/query.php
index 7d13881c6..f5ea2838c 100644
--- a/wp-includes/query.php
+++ b/wp-includes/query.php
@@ -546,7 +546,7 @@ class WP_Query {
 			$q['what_to_show'] = 'posts';
 		}
 
-		if ( $this->is_home && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+		if ( $this->is_home && empty($this->query) && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
 			$this->is_page = true;
 			$this->is_home = false;
 			$q['page_id'] = get_option('page_on_front');