<!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>[30480] trunk: Correct an SQL syntax error introduced in r30158.</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/30480">30480</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/30480","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-20 16:45:48 +0000 (Thu, 20 Nov 2014)</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'>Correct an SQL syntax error introduced in <a href="https://core.trac.wordpress.org/changeset/30158">r30158</a>. Adds tests.
Fixes <a href="https://core.trac.wordpress.org/ticket/30339">#30339</a>
See <a href="https://core.trac.wordpress.org/ticket/18962">#18962</a>
Props julien731</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunktestsphpunittestspostphp">trunk/tests/phpunit/tests/post.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2014-11-20 16:40:29 UTC (rev 30479)
+++ trunk/src/wp-includes/post.php 2014-11-20 16:45:48 UTC (rev 30480)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3720,7 +3720,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $suffix = 2;
</span><span class="cx" style="display: block; padding: 0 10px"> do {
</span><span class="cx" style="display: block; padding: 0 10px"> $alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID, $post_parent ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> $suffix++;
</span><span class="cx" style="display: block; padding: 0 10px"> } while ( $post_name_check );
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = $alt_post_name;
</span></span></pre></div>
<a id="trunktestsphpunittestspostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/post.php 2014-11-20 16:40:29 UTC (rev 30479)
+++ trunk/tests/phpunit/tests/post.php 2014-11-20 16:45:48 UTC (rev 30480)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1018,6 +1018,67 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 30339
+ */
+ function test_wp_unique_post_slug_with_hierarchy() {
+ register_post_type( 'post-type-1', array( 'hierarchical' => true ) );
+
+ $args = array(
+ 'post_type' => 'post-type-1',
+ 'post_name' => 'some-slug',
+ 'post_status' => 'publish',
+ );
+ $one = $this->factory->post->create( $args );
+ $args['post_name'] = 'some-slug-2';
+ $two = $this->factory->post->create( $args );
+
+ $this->assertEquals( 'some-slug', get_post( $one )->post_name );
+ $this->assertEquals( 'some-slug-2', get_post( $two )->post_name );
+
+ $this->assertEquals( 'some-slug-3', wp_unique_post_slug( 'some-slug', 0, 'publish', 'post-type-1', 0 ) );
+
+ _unregister_post_type( 'post-type-1' );
+ }
+
+ /**
+ * @ticket 18962
+ */
+ function test_wp_unique_post_slug_with_hierarchy_and_attachments() {
+ register_post_type( 'post-type-1', array( 'hierarchical' => true ) );
+
+ $args = array(
+ 'post_type' => 'post-type-1',
+ 'post_name' => 'some-slug',
+ 'post_status' => 'publish',
+ );
+ $one = $this->factory->post->create( $args );
+
+ $args = array(
+ 'post_mime_type' => 'image/jpeg',
+ 'post_type' => 'attachment',
+ 'post_name' => 'image'
+ );
+ $attachment = $this->factory->attachment->create_object( 'image.jpg', $one, $args );
+
+ $args = array(
+ 'post_type' => 'post-type-1',
+ 'post_name' => 'image',
+ 'post_status' => 'publish',
+ 'post_parent' => $one
+ );
+ $two = $this->factory->post->create( $args );
+
+ $this->assertEquals( 'some-slug', get_post( $one )->post_name );
+ $this->assertEquals( 'image', get_post( $attachment )->post_name );
+ $this->assertEquals( 'image-2', get_post( $two )->post_name );
+
+ // 'image' can be a child of image-2
+ $this->assertEquals( 'image', wp_unique_post_slug( 'image', 0, 'publish', 'post-type-1', $two ) );
+
+ _unregister_post_type( 'post-type-1' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @ticket 21212
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_utf8mb3_post_saves_with_emoji() {
</span></span></pre>
</div>
</div>
</body>
</html>