<!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>[39454] branches/4.7: Revert [38677] from the 4.7 branch.</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/39454">39454</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/39454","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-12-03 04:04:05 +0000 (Sat, 03 Dec 2016)</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'>Revert <a href="https://core.trac.wordpress.org/changeset/38677">[38677]</a> from the 4.7 branch.
This avoids fatal errors caused with recursive calling of term functions within the `get_terms` filter.

See <a href="https://core.trac.wordpress.org/ticket/21760">#21760</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludestaxonomyphp">branches/4.7/src/wp-includes/taxonomy.php</a></li>
<li><a href="#branches47testsphpunitteststermcachephp">branches/4.7/tests/phpunit/tests/term/cache.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches47srcwpincludestaxonomyphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/src/wp-includes/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/taxonomy.php 2016-12-03 03:50:02 UTC (rev 39453)
+++ branches/4.7/src/wp-includes/taxonomy.php   2016-12-03 04:04:05 UTC (rev 39454)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -824,55 +824,49 @@
</span><span class="cx" style="display: block; padding: 0 10px">  *                             or `$term` was not found.
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_term_by( $field, $value, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+        global $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        // 'term_taxonomy_id' lookups don't require taxonomy checks.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'term_taxonomy_id' !== $field && ! taxonomy_exists( $taxonomy ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                return false;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        if ( 'id' === $field || 'term_id' === $field ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tax_clause = $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+
+       if ( 'slug' == $field ) {
+               $_field = 't.slug';
+               $value = sanitize_title($value);
+               if ( empty($value) )
+                       return false;
+       } elseif ( 'name' == $field ) {
+               // Assume already escaped
+               $value = wp_unslash($value);
+               $_field = 't.name';
+       } elseif ( 'term_taxonomy_id' == $field ) {
+               $value = (int) $value;
+               $_field = 'tt.term_taxonomy_id';
+
+               // No `taxonomy` clause when searching by 'term_taxonomy_id'.
+               $tax_clause = '';
+       } else {
</ins><span class="cx" style="display: block; padding: 0 10px">                 $term = get_term( (int) $value, $taxonomy, $output, $filter );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                if ( is_wp_error( $term ) || null === $term ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         if ( is_wp_error( $term ) || is_null( $term ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                         $term = false;
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px">                return $term;
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $args = array(
-               'get'                    => 'all',
-               'number'                 => 1,
-               'taxonomy'               => $taxonomy,
-               'update_term_meta_cache' => false,
-               'orderby'                => 'none',
-       );
-
-       switch ( $field ) {
-               case 'slug' :
-                       $args['slug'] = $value;
-                       break;
-               case 'name' :
-                       $args['name'] = $value;
-                       break;
-               case 'term_taxonomy_id' :
-                       $args['term_taxonomy_id'] = $value;
-                       unset( $args[ 'taxonomy' ] );
-                       break;
-               default :
-                       return false;
-       }
-
-       $terms = get_terms( $args );
-       if ( is_wp_error( $terms ) || empty( $terms ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term = $wpdb->get_row( $wpdb->prepare( "SELECT t.*, tt.* FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON t.term_id = tt.term_id WHERE $_field = %s", $value ) . " $tax_clause LIMIT 1" );
+       if ( ! $term )
</ins><span class="cx" style="display: block; padding: 0 10px">                 return false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        }
</del><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-        $term = array_shift( $terms );
-
</del><span class="cx" style="display: block; padding: 0 10px">         // In the case of 'term_taxonomy_id', override the provided `$taxonomy` with whatever we find in the db.
</span><span class="cx" style="display: block; padding: 0 10px">        if ( 'term_taxonomy_id' === $field ) {
</span><span class="cx" style="display: block; padding: 0 10px">                $taxonomy = $term->taxonomy;
</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">+        wp_cache_add( $term->term_id, $term, 'terms' );
+
</ins><span class="cx" style="display: block; padding: 0 10px">         return get_term( $term, $taxonomy, $output, $filter );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="branches47testsphpunitteststermcachephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/4.7/tests/phpunit/tests/term/cache.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/term/cache.php   2016-12-03 03:50:02 UTC (rev 39453)
+++ branches/4.7/tests/phpunit/tests/term/cache.php     2016-12-03 04:04:05 UTC (rev 39454)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,177 +221,6 @@
</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">        /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-         * @ticket 21760
-        */
-       function test_get_term_by_slug_cache() {
-               global $wpdb;
-
-               $term_id = $this->factory->term->create( array( 'slug' => 'burrito', 'name' => 'Taco', 'taxonomy' => 'post_tag' ) );
-
-               clean_term_cache( $term_id, 'post_tag' );
-               $num_queries = $wpdb->num_queries;
-
-               $term = get_term_by( 'slug', 'burrito', 'post_tag' );
-               $num_queries++;
-               $this->assertEquals( 'Taco', $term->name );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               // This should now hit cache.
-               $term = get_term_by( 'slug', 'burrito', 'post_tag' );
-               $this->assertEquals( 'Taco', $term->name );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               $this->assertEquals( get_term( $term_id, 'post_tag' ), $term );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-       }
-
-       /**
-        * @ticket 21760
-        */
-       function test_get_term_by_slug_cache_update() {
-               global $wpdb;
-
-               $term_id = $this->factory->term->create( array( 'slug' => 'burrito', 'name' => 'Taco', 'taxonomy' => 'post_tag' ) );
-
-               clean_term_cache( $term_id, 'post_tag' );
-               $num_queries = $wpdb->num_queries;
-
-               $term = get_term_by( 'slug', 'burrito', 'post_tag' );
-               $num_queries++;
-               $this->assertEquals( 'Taco', $term->name );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               // This should now hit cache.
-               $term = get_term_by( 'slug', 'burrito', 'post_tag' );
-               $this->assertEquals( 'Taco', $term->name );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               // Update the tag which invalidates the cache.
-               wp_update_term( $term_id, 'post_tag', array( 'name' => 'No Taco' ) );
-               $num_queries = $wpdb->num_queries;
-
-               // This should not hit cache.
-               $term = get_term_by( 'slug', 'burrito', 'post_tag' );
-               $num_queries++;
-               $this->assertEquals( 'No Taco', $term->name );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-       }
-
-       /**
-        * @ticket 21760
-        */
-       function test_get_term_by_name_cache() {
-               global $wpdb;
-
-               $term_id = $this->factory->term->create( array( 'name' => 'Burrito', 'slug' => 'noburrito', 'taxonomy' => 'post_tag' ) );
-
-               clean_term_cache( $term_id, 'post_tag' );
-               $num_queries = $wpdb->num_queries;
-
-               get_term_by( 'name', 'Burrito', 'post_tag' );
-               $num_queries++;
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               // This should now hit cache.
-               $term = get_term_by( 'name', 'Burrito', 'post_tag' );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               $this->assertEquals( get_term( $term_id, 'post_tag' ), $term );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-       }
-
-       /**
-        * @ticket 21760
-        */
-       function test_get_term_by_name_cache_update() {
-               global $wpdb;
-
-               $term_id = $this->factory->term->create( array( 'name' => 'Burrito', 'slug' => 'noburrito', 'taxonomy' => 'post_tag' ) );
-
-               clean_term_cache( $term_id, 'post_tag' );
-               $num_queries = $wpdb->num_queries;
-
-               get_term_by( 'name', 'Burrito', 'post_tag' );
-               $num_queries++;
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               // This should now hit cache.
-               get_term_by( 'name', 'Burrito', 'post_tag' );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               // Update the tag which invalidates the cache.
-               wp_update_term( $term_id, 'post_tag', array( 'slug' => 'taco' ) );
-               $num_queries = $wpdb->num_queries;
-
-               // This should not hit cache.
-               get_term_by( 'name', 'burrito', 'post_tag' );
-               $num_queries++;
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-       }
-
-       /**
-        * @ticket 21760
-        */
-       function test_invalidating_term_caches_should_fail_when_invalidation_is_suspended() {
-               global $wpdb;
-
-               $term_id = $this->factory->term->create( array( 'name' => 'Burrito', 'taxonomy' => 'post_tag' ) );
-
-               clean_term_cache( $term_id, 'post_tag' );
-               $num_queries = $wpdb->num_queries;
-               $last_changed = wp_cache_get( 'last_changed', 'terms' );
-
-               $term1 = get_term_by( 'name', 'Burrito', 'post_tag' );
-               $num_queries++;
-
-               // Verify the term is cached.
-               $term2 = get_term_by( 'name', 'Burrito', 'post_tag' );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-               $this->assertEquals( $term1, $term2 );
-
-               $suspend = wp_suspend_cache_invalidation();
-
-               // Update the tag.
-               wp_update_term( $term_id, 'post_tag', array( 'name' => 'Taco' ) );
-               $num_queries = $wpdb->num_queries;
-
-               // Verify that the cached term still matches the initial cached term.
-               $term3 = get_term_by( 'name', 'Burrito', 'post_tag' );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-               $this->assertEquals( $term1, $term3 );
-
-               // Verify that last changed has not been updated as part of an invalidation routine.
-               $this->assertSame( $last_changed, wp_cache_get( 'last_changed', 'terms' ) );
-
-               // Clean up.
-               wp_suspend_cache_invalidation( $suspend );
-       }
-
-       /**
-        * @ticket 21760
-        */
-       public function test_get_term_by_does_not_prime_term_meta_cache() {
-               global $wpdb;
-
-               $term_id = $this->factory->term->create( array( 'name' => 'Burrito', 'taxonomy' => 'post_tag' ) );
-               add_term_meta( $term_id, 'foo', 'bar' );
-
-               clean_term_cache( $term_id, 'post_tag' );
-               $num_queries = $wpdb->num_queries;
-
-               $term = get_term_by( 'name', 'Burrito', 'post_tag' );
-               $num_queries++;
-               $this->assertTrue( $term instanceof WP_Term );
-               $this->assertSame( $term_id, $term->term_id );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-
-               $term_meta = get_term_meta( $term_id, 'foo', true );
-               $num_queries++;
-               $this->assertSame( $term_meta, 'bar' );
-               $this->assertEquals( $num_queries, $wpdb->num_queries );
-       }
-
-       /**
</del><span class="cx" style="display: block; padding: 0 10px">          * @ticket 37291
</span><span class="cx" style="display: block; padding: 0 10px">         */
</span><span class="cx" style="display: block; padding: 0 10px">        public function test_get_object_term_cache_should_return_error_if_any_term_is_an_error() {
</span></span></pre>
</div>
</div>

</body>
</html>