diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-14 10:21:46 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-06-14 10:21:46 +0000 |
| commit | 3d4865cfcd5f08384a86045752ca6e74502afcd4 (patch) | |
| tree | 6e877171b566a9ea6391c69bc7153481cf6cfab9 /wp-inst | |
| parent | 19b51f30bd324ecb36f99d159947b75c22b6fecf (diff) | |
| download | wordpress-mu-3d4865cfcd5f08384a86045752ca6e74502afcd4.tar.gz wordpress-mu-3d4865cfcd5f08384a86045752ca6e74502afcd4.tar.xz wordpress-mu-3d4865cfcd5f08384a86045752ca6e74502afcd4.zip | |
Query fix (core ticket #2822)
Correct rss filename (thanks Dave Cohen)
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@560 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst')
| -rw-r--r-- | wp-inst/wp-admin/index.php | 2 | ||||
| -rw-r--r-- | wp-inst/wp-includes/query.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/wp-inst/wp-admin/index.php b/wp-inst/wp-admin/index.php index b338cfd..173bcb8 100644 --- a/wp-inst/wp-admin/index.php +++ b/wp-inst/wp-admin/index.php @@ -2,7 +2,7 @@ require_once('admin.php'); $title = __('Dashboard'); require_once('admin-header.php'); -require_once (ABSPATH . WPINC . '/rss-functions.php'); +require_once (ABSPATH . WPINC . '/rss.php'); $today = current_time('mysql', 1); ?> diff --git a/wp-inst/wp-includes/query.php b/wp-inst/wp-includes/query.php index 305c7e1..5e47486 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 && ( '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');
|