summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/query.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-22 10:08:38 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-06-22 10:08:38 +0000
commit0637b21e512e0ee8bca53bdb479bf35f8085fe41 (patch)
treed6226dbedba232a2ae71260381030df7a1e4fde4 /wp-inst/wp-includes/query.php
parent9f63c9fe67acd3e6c600de8e4bec6de823c6e8da (diff)
downloadwordpress-mu-0637b21e512e0ee8bca53bdb479bf35f8085fe41.tar.gz
wordpress-mu-0637b21e512e0ee8bca53bdb479bf35f8085fe41.tar.xz
wordpress-mu-0637b21e512e0ee8bca53bdb479bf35f8085fe41.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@587 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/query.php')
-rw-r--r--wp-inst/wp-includes/query.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/wp-inst/wp-includes/query.php b/wp-inst/wp-includes/query.php
index 0aca74b..ae6ecbe 100644
--- a/wp-inst/wp-includes/query.php
+++ b/wp-inst/wp-includes/query.php
@@ -546,7 +546,7 @@ class WP_Query {
$q['what_to_show'] = 'posts';
}
- if ( $this->is_home && empty($this->query) && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+ if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( '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');