<!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>[39993] branches/4.7: Revert to pre-4.7 behavior for fetching object instances by id.</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/39993">39993</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/39993","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>2017-01-26 16:56:21 +0000 (Thu, 26 Jan 2017)</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 to pre-4.7 behavior for fetching object instances by id.
This changeset reverts <a href="https://core.trac.wordpress.org/changeset/38381">[38381]</a>, which caused inconsistencies in the way the
REST API fetches posts and other objects.
Merge of <a href="https://core.trac.wordpress.org/changeset/39992">[39992]</a> to the 4.7 branch.
See <a href="https://core.trac.wordpress.org/ticket/38792">#38792</a>, <a href="https://core.trac.wordpress.org/ticket/37738">#37738</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches47srcwpincludesclasswpcommentphp">branches/4.7/src/wp-includes/class-wp-comment.php</a></li>
<li><a href="#branches47srcwpincludesclasswppostphp">branches/4.7/src/wp-includes/class-wp-post.php</a></li>
<li><a href="#branches47srcwpincludesclasswptermphp">branches/4.7/src/wp-includes/class-wp-term.php</a></li>
<li><a href="#branches47testsphpunittestscommentwpCommentphp">branches/4.7/tests/phpunit/tests/comment/wpComment.php</a></li>
<li><a href="#branches47testsphpunittestspostwpPostphp">branches/4.7/tests/phpunit/tests/post/wpPost.php</a></li>
<li><a href="#branches47testsphpunitteststermwpTermphp">branches/4.7/tests/phpunit/tests/term/wpTerm.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches47">branches/4.7/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/4.7
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/4.7 2017-01-26 16:52:51 UTC (rev 39992)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/4.7 2017-01-26 16:56:21 UTC (rev 39993)
</ins><a id="branches47"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/4.7</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/3.1:18031
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.3:20543
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/3.4:21757
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39685,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39952,39954,39956,39968
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:18512,39365,39367,39369,39371,39373,39375-39376,39378,39380,39382,39384,39386,39388,39390,39392-39393,39396-39397,39400,39402,39404,39406,39409,39411,39413,39415,39417-39420,39424,39426,39428,39430,39432-39434,39436,39438,39440,39442-39444,39447,39449-39451,39453,39455-39457,39460,39462,39464,39466,39468,39470-39471,39475,39477-39478,39482-39483,39487-39488,39490,39495-39496,39499,39502,39504,39506,39508,39510,39512,39514,39517,39520,39522,39545-39547,39557-39563,39565,39578,39580-39581,39584,39586,39594-39595,39597-39599,39601,39603,39612-39613,39616-39617,39619-39623,39626,39635,39640,39645,39649,39657,39659,39663,39677-39678,39680-39681,39684-39685,39688-39689,39692,39720,39742,39744,39759-39760,39772,39795,39807-39808,39831,39843,39848,39850,39952,39954,39956,39968,39992
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches47srcwpincludesclasswpcommentphp"></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/class-wp-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/class-wp-comment.php 2017-01-26 16:52:51 UTC (rev 39992)
+++ branches/4.7/src/wp-includes/class-wp-comment.php 2017-01-26 16:56:21 UTC (rev 39993)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,12 +191,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_instance( $id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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 ( ! is_numeric( $id ) || $id != floor( $id ) || ! $id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $comment_id = (int) $id;
+ if ( ! $comment_id ) {
</ins><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">- $comment_id = (int) $id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $_comment = wp_cache_get( $comment_id, 'comment' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $_comment ) {
</span></span></pre></div>
<a id="branches47srcwpincludesclasswppostphp"></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/class-wp-post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/class-wp-post.php 2017-01-26 16:52:51 UTC (rev 39992)
+++ branches/4.7/src/wp-includes/class-wp-post.php 2017-01-26 16:56:21 UTC (rev 39993)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,12 +210,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_instance( $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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 ( ! is_numeric( $post_id ) || $post_id != floor( $post_id ) || ! $post_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_id = (int) $post_id;
+ if ( ! $post_id ) {
</ins><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">- $post_id = (int) $post_id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $_post = wp_cache_get( $post_id, 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $_post ) {
</span></span></pre></div>
<a id="branches47srcwpincludesclasswptermphp"></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/class-wp-term.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/src/wp-includes/class-wp-term.php 2017-01-26 16:52:51 UTC (rev 39992)
+++ branches/4.7/src/wp-includes/class-wp-term.php 2017-01-26 16:56:21 UTC (rev 39993)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,12 +125,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public static function get_instance( $term_id, $taxonomy = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</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 ( ! is_numeric( $term_id ) || $term_id != floor( $term_id ) || ! $term_id ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $term_id = (int) $term_id;
+ if ( ! $term_id ) {
</ins><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">- $term_id = (int) $term_id;
-
</del><span class="cx" style="display: block; padding: 0 10px"> $_term = wp_cache_get( $term_id, 'terms' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there isn't a cached version, hit the database.
</span></span></pre></div>
<a id="branches47testsphpunittestscommentwpCommentphp"></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/comment/wpComment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/comment/wpComment.php 2017-01-26 16:52:51 UTC (rev 39992)
+++ branches/4.7/tests/phpunit/tests/comment/wpComment.php 2017-01-26 16:56:21 UTC (rev 39993)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,46 +52,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37738
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_get_instance_should_fail_for_bool() {
- $found = WP_Comment::get_instance( true );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_get_instance_should_succeed_for_float_that_is_equal_to_post_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> $found = WP_Comment::get_instance( 1.0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 1, $found->comment_ID );
</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 37738
- */
- public function test_get_instance_should_fail_for_float() {
- $found = WP_Comment::get_instance( 1.6 );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
- public function test_get_instance_should_fail_for_array() {
- $found = WP_Comment::get_instance( array( 1 ) );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
- public function test_get_instance_should_fail_for_class() {
- $class = new stdClass();
- $found = WP_Comment::get_instance( $class );
-
- $this->assertFalse( $found );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches47testsphpunittestspostwpPostphp"></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/post/wpPost.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/post/wpPost.php 2017-01-26 16:52:51 UTC (rev 39992)
+++ branches/4.7/tests/phpunit/tests/post/wpPost.php 2017-01-26 16:56:21 UTC (rev 39993)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -50,46 +50,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37738
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_get_instance_should_fail_for_bool() {
- $found = WP_Post::get_instance( true );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_get_instance_should_succeed_for_float_that_is_equal_to_post_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> $found = WP_Post::get_instance( 1.0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $found->ID );
</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 37738
- */
- public function test_get_instance_should_fail_for_float() {
- $found = WP_Post::get_instance( 1.6 );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
- public function test_get_instance_should_fail_for_array() {
- $found = WP_Post::get_instance( array( 1 ) );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
- public function test_get_instance_should_fail_for_class() {
- $class = new stdClass();
- $found = WP_Post::get_instance( $class );
-
- $this->assertFalse( $found );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches47testsphpunitteststermwpTermphp"></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/wpTerm.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/4.7/tests/phpunit/tests/term/wpTerm.php 2017-01-26 16:52:51 UTC (rev 39992)
+++ branches/4.7/tests/phpunit/tests/term/wpTerm.php 2017-01-26 16:56:21 UTC (rev 39993)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,46 +63,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 37738
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_get_instance_should_fail_for_bool() {
- $found = WP_Term::get_instance( true );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_get_instance_should_succeed_for_float_that_is_equal_to_post_id() {
</span><span class="cx" style="display: block; padding: 0 10px"> $found = WP_Term::get_instance( 1.0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame( 1, $found->term_id );
</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 37738
- */
- public function test_get_instance_should_fail_for_float() {
- $found = WP_Term::get_instance( 1.6 );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
- public function test_get_instance_should_fail_for_array() {
- $found = WP_Term::get_instance( array( 1 ) );
-
- $this->assertFalse( $found );
- }
-
- /**
- * @ticket 37738
- */
- public function test_get_instance_should_fail_for_class() {
- $class = new stdClass();
- $found = WP_Term::get_instance( $class );
-
- $this->assertFalse( $found );
- }
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>