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

Disambiguate columns. Props lawrence123. fixes #5256 

git-svn-id: http://svn.automattic.com/wordpress/trunk@6310 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2007-11-03 19:00:33 +00:00
parent 3d04ae4f29
commit a2e0f3352f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/query.php
View File

@ -868,12 +868,12 @@ class WP_Query {
// If a post number is specified, load that post
if ( $q['p'] )
$where = ' AND ID = ' . $q['p'];
$where = " AND {$wpdb->posts}.ID = " . $q['p'];
if ( $q['page_id'] ) {
if ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
$q['p'] = $q['page_id'];
$where = ' AND ID = ' . $q['page_id'];
$where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
}
}