vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-05 15:16:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid database error when include or exclude is not really a term_id. Adds more unit tests.

Browse Source 
Props kovshenin.
Fixes #11823.



git-svn-id: https://develop.svn.wordpress.org/trunk@25257 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Scott Taylor
2013-09-05 17:14:54 +00:00
parent 4286692d7d
commit e8c7634e79
2 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/wp-includes/taxonomy.php
+6 -3
View File
@@ -1310,9 +1310,10 @@ function get_terms($taxonomies, $args = '') {
$inclusions = implode( ',', wp_parse_id_list( $include ) );
}
if ( ! empty( $inclusions ) )
if ( ! empty( $inclusions ) ) {
$inclusions = ' AND t.term_id IN ( ' . $inclusions . ' )';
$where .= $inclusions;
$where .= $inclusions;
}
$exclusions = '';
if ( ! empty( $exclude_tree ) ) {
@@ -1339,7 +1340,9 @@ function get_terms($taxonomies, $args = '') {
$exclusions = ' AND t.term_id NOT IN (' . $exclusions . ')';
$exclusions = apply_filters( 'list_terms_exclusions', $exclusions, $args );
$where .= $exclusions;
if ( ! empty( $exclusions ) )
$where .= $exclusions;
if ( !empty($slug) ) {
$slug = sanitize_title($slug);