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

Cat exclusion from skeltoac. fixes #2825 

git-svn-id: http://svn.automattic.com/wordpress/trunk@3886 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
ryan 2006-06-19 17:14:54 +00:00
parent b9d8d2e9fd
commit bd1842e963
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/query.php
View File

@ -708,7 +708,7 @@ class WP_Query {
$q['cat'] = addslashes_gpc($q['cat']); $q['cat'] = addslashes_gpc($q['cat']);
$join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) "; $join = " LEFT JOIN $wpdb->post2cat ON ($wpdb->posts.ID = $wpdb->post2cat.post_id) ";
$cat_array = preg_split('/[,\s]+/', $q['cat']); $cat_array = preg_split('/[,\s]+/', $q['cat']);
$in_cats = $out_cats = ''; $in_cats = $out_cats = $out_posts = '';
foreach ( $cat_array as $cat ) { foreach ( $cat_array as $cat ) {
$cat = intval($cat); $cat = intval($cat);
$in = strstr($cat, '-') ? false : true; $in = strstr($cat, '-') ? false : true;
@ -722,8 +722,16 @@ class WP_Query {
$out_cats = substr($out_cats, 0, -2); $out_cats = substr($out_cats, 0, -2);
if ( strlen($in_cats) > 0 ) if ( strlen($in_cats) > 0 )
$in_cats = " AND category_id IN ($in_cats)"; $in_cats = " AND category_id IN ($in_cats)";
if ( strlen($out_cats) > 0 ) if ( strlen($out_cats) > 0 ) {
$out_cats = " AND category_id NOT IN ($out_cats)"; $ids = $wpdb->get_col("SELECT post_id FROM $wpdb->post2cat WHERE category_id IN ($out_cats)");
if ( is_array($ids) && count($ids > 0) ) {
foreach ( $ids as $id )
$out_posts .= "$id, ";
$out_posts = substr($out_posts, 0, -2);
}
if ( strlen($out_posts) > 0 )
$out_cats = " AND ID NOT IN ($out_posts)";
}
$whichcat = $in_cats . $out_cats; $whichcat = $in_cats . $out_cats;
$distinct = 'DISTINCT'; $distinct = 'DISTINCT';
} }