<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[34088] trunk: Remove extraneous table join in `get_adjacent_post()`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/34088">34088</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/34088","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>boonebgorges</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-12 20:33:07 +0000 (Sat, 12 Sep 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Remove extraneous table join in `get_adjacent_post()`.
Since <a href="https://core.trac.wordpress.org/changeset/29248">[29248]</a>, a table join has not been necessary to process the
`$excluded_terms` parameter of `get_adjacent_post()`. Aside from adding extra
overhead, this join meant that post records that don't have any corresponding
rows in `wp_term_relationships` were erroneously excluded from results.
Fixes <a href="https://core.trac.wordpress.org/ticket/32833">#32833</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunktestsphpunittestslinkphp">trunk/tests/phpunit/tests/link.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeslinktemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2015-09-12 20:02:43 UTC (rev 34087)
+++ trunk/src/wp-includes/link-template.php 2015-09-12 20:33:07 UTC (rev 34088)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1492,9 +1492,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $where = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $in_same_term || ! empty( $excluded_terms ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $join = " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
- $where = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
-
</del><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and "
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== strpos( $excluded_terms, ' and ' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1508,6 +1505,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $in_same_term ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
+ $where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
</span><span class="cx" style="display: block; padding: 0 10px"> return '';
</span><span class="cx" style="display: block; padding: 0 10px"> $term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
</span></span></pre></div>
<a id="trunktestsphpunittestslinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/link.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/link.php 2015-09-12 20:02:43 UTC (rev 34087)
+++ trunk/tests/phpunit/tests/link.php 2015-09-12 20:33:07 UTC (rev 34088)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -257,6 +257,73 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( get_adjacent_post( false, array(), false ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @ticket 32833
+ */
+ public function test_get_adjacent_post_excluded_terms() {
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $t = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ $p1 = $this->factory->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
+ $p2 = $this->factory->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
+ $p3 = $this->factory->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
+
+ wp_set_post_terms( $p2, array( $t ), 'wptests_tax' );
+
+ // Fake current page.
+ $_post = isset( $GLOBALS['post'] ) ? $GLOBALS['post'] : null;
+ $GLOBALS['post'] = get_post( $p1 );
+
+ $found = get_adjacent_post( false, array( $t ), true, 'wptests_tax' );
+
+ if ( ! is_null( $_post ) ) {
+ $GLOBALS['post'] = $_post;
+ } else {
+ unset( $GLOBALS['post'] );
+ }
+
+ // Should skip $p2, which belongs to $t.
+ $this->assertEquals( $p3, $found->ID );
+ }
+
+ /**
+ * @ticket 32833
+ */
+ public function test_get_adjacent_post_excluded_terms_should_not_require_posts_to_have_terms_in_any_taxonomy() {
+ register_taxonomy( 'wptests_tax', 'post' );
+
+ $t = $this->factory->term->create( array(
+ 'taxonomy' => 'wptests_tax',
+ ) );
+
+ $p1 = $this->factory->post->create( array( 'post_date' => '2015-08-27 12:00:00' ) );
+ $p2 = $this->factory->post->create( array( 'post_date' => '2015-08-26 12:00:00' ) );
+ $p3 = $this->factory->post->create( array( 'post_date' => '2015-08-25 12:00:00' ) );
+
+ wp_set_post_terms( $p2, array( $t ), 'wptests_tax' );
+
+ // Make sure that $p3 doesn't have the 'Uncategorized' category.
+ wp_delete_object_term_relationships( $p3, 'category' );
+
+ // Fake current page.
+ $_post = isset( $GLOBALS['post'] ) ? $GLOBALS['post'] : null;
+ $GLOBALS['post'] = get_post( $p1 );
+
+ $found = get_adjacent_post( false, array( $t ), true, 'wptests_tax' );
+
+ if ( ! is_null( $_post ) ) {
+ $GLOBALS['post'] = $_post;
+ } else {
+ unset( $GLOBALS['post'] );
+ }
+
+ // Should skip $p2, which belongs to $t.
+ $this->assertEquals( $p3, $found->ID );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_make_link_relative_with_http_scheme() {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = 'http://example.com/this-is-a-test-http-url/';
</span><span class="cx" style="display: block; padding: 0 10px"> $relative_link = wp_make_link_relative( $link );
</span></span></pre>
</div>
</div>
</body>
</html>