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

Move excluded_terms filter in `get_adjacent_post()`. 

The filter was added in 4.4 [34528] #9571, but in a place where it could not
affect the adjacent post query.

Fixes #35211.
Built from https://develop.svn.wordpress.org/trunk@36078


git-svn-id: http://core.svn.wordpress.org/trunk@36043 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Boone Gorges 2015-12-23 19:57:27 +00:00
parent 7d734dd91f
commit 753243a6f7
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
wp-includes/link-template.php
View File

@ -1568,6 +1568,7 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
$join = '';
$where = '';
$adjacent = $previous ? 'previous' : 'next';
if ( $in_same_term || ! empty( $excluded_terms ) ) {
if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
@ -1600,6 +1601,18 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
}
/**
* Filter the IDs of terms excluded from adjacent post queries.
*
* The dynamic portion of the hook name, `$adjacent`, refers to the type
* of adjacency, 'next' or 'previous'.
*
* @since 4.4.0
*
* @param string $excluded_terms Array of excluded term IDs.
*/
$excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms );
if ( ! empty( $excluded_terms ) ) {
$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( $excluded_terms, ',' ) . ') )';
}
@ -1635,22 +1648,9 @@ function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previo
$where .= " AND p.post_status = 'publish'";
}
$adjacent = $previous ? 'previous' : 'next';
$op = $previous ? '<' : '>';
$order = $previous ? 'DESC' : 'ASC';
/**
* Filter the excluded term ids
*
* The dynamic portion of the hook name, `$adjacent`, refers to the type
* of adjacency, 'next' or 'previous'.
*
* @since 4.4.0
*
* @param string $excluded_terms Array of excluded term IDs.
*/
$excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms );
/**
* Filter the JOIN clause in the SQL for an adjacent post query.
*

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.5-alpha-36077';
$wp_version = '4.5-alpha-36078';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.