WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix current page handling when using page_for_posts. Props skeltoac. fixes #2959 

git-svn-id: http://svn.automattic.com/wordpress/trunk@4023 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-07-20 02:05:25 +00:00
parent 9094543b51
commit e109d4e11b
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wp-includes/query.php
View File

@ -279,6 +279,7 @@ class WP_Query {
var $is_admin = false;
var $is_attachment = false;
var $is_robots = false;
var $is_posts_page = false;
function init_query_flags() {
$this->is_single = false;
@ -300,6 +301,7 @@ class WP_Query {
$this->is_admin = false;
$this->is_attachment = false;
$this->is_robots = false;
$this->is_posts_page = false;
}
function init () {
@ -627,6 +629,7 @@ class WP_Query {
if ( ('page' == get_option('show_on_front') ) && ( $reqpage == get_option('page_for_posts') ) ) {
$this->is_page = false;
$this->is_home = true;
$this->is_posts_page = true;
} else {
$q['pagename'] = str_replace('%2F', '/', urlencode(urldecode($q['pagename'])));
$page_paths = '/' . trim($q['pagename'], '/');
@ -665,6 +668,7 @@ class WP_Query {
if ( ('page' == get_option('show_on_front') ) && ( $q['page_id'] == get_option('page_for_posts') ) ) {
$this->is_page = false;
$this->is_home = true;
$this->is_posts_page = true;
} else {
$q['p'] = $q['page_id'];
$where = ' AND ID = '.$q['page_id'];
@ -1018,6 +1022,9 @@ class WP_Query {
$category = &get_category($cat);
$this->queried_object = &$category;
$this->queried_object_id = $cat;
} else if ($this->is_posts_page) {
$this->queried_object = & get_page(get_option('page_for_posts'));
$this->queried_object_id = $this->queried_object->ID;
} else if ($this->is_single) {
$this->queried_object = $this->post;
$this->queried_object_id = $this->post->ID;