<!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>[34690] trunk: Permalinks: Add pretty permalinks for unattached attachments.</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/34690">34690</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/34690","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>pento</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-09-29 09:41:14 +0000 (Tue, 29 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'>Permalinks: Add pretty permalinks for unattached attachments.
Previously, unattached attachments would have unsightly `/?attachment_id=1` URLs. As we've moved away from attachments being specifically attached to posts, instead being Media items, this has made the unattached URLs a more common occurrence.
We can breath easy once more, knowing that the world is a little bit safer from the horror of unnecessarily ugly URLs.
Props SergeyBiryukov, wonderboymusic, pento.
Fixes <a href="https://core.trac.wordpress.org/ticket/1914">#1914</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.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="trunksrcwpadminincludespostphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2015-09-29 06:38:02 UTC (rev 34689)
+++ trunk/src/wp-admin/includes/post.php 2015-09-29 09:41:14 UTC (rev 34690)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1296,7 +1296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $view_link = get_preview_post_link( $post, array(), $draft_link );
</span><span class="cx" style="display: block; padding: 0 10px"> $preview_target = " target='wp-preview-{$post->ID}'";
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'publish' === $post->post_status ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $view_link = get_permalink( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> // Allow non-published (private, future) to be viewed at a pretty permalink.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1310,7 +1310,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( false !== $view_link ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $permalink . "</a>\n";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $view_link . "</a>\n";
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<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-29 06:38:02 UTC (rev 34689)
+++ trunk/src/wp-includes/link-template.php 2015-09-29 09:41:14 UTC (rev 34690)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -386,6 +386,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post = get_post( $post );
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $parent && ! in_array( $parent->post_type, get_post_types() ) ) {
+ $parent = false;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_rewrite->using_permalinks() && $parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' == $parent->post_type )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,6 +406,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $leavename )
</span><span class="cx" style="display: block; padding: 0 10px"> $link = str_replace( '%postname%', $name, $link );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
+ $link = home_url( user_trailingslashit( $post->post_name ) );
</ins><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 ( ! $link )
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2015-09-29 06:38:02 UTC (rev 34689)
+++ trunk/src/wp-includes/query.php 2015-09-29 09:41:14 UTC (rev 34690)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3580,6 +3580,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Check post status to determine if post should be displayed.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $status = get_post_status($this->posts[0]);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent ) {
+ $this->is_page = false;
+ $this->is_single = true;
+ $this->is_attachment = true;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_status_obj = get_post_status_object($status);
</span><span class="cx" style="display: block; padding: 0 10px"> //$type = get_post_type($this->posts[0]);
</span><span class="cx" style="display: block; padding: 0 10px">
</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-29 06:38:02 UTC (rev 34689)
+++ trunk/tests/phpunit/tests/link.php 2015-09-29 09:41:14 UTC (rev 34690)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -395,4 +395,58 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( $non_pretty_permalink, get_permalink( $p ) );
</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 1914
+ */
+ public function test_unattached_attachment_has_a_pretty_permalink() {
+ global $wp_rewrite;
+ $wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
+ $wp_rewrite->flush_rules();
+
+ $attachment_id = $this->factory->attachment->create_object( 'image.jpg', 0, array(
+ 'post_mime_type' => 'image/jpeg',
+ 'post_type' => 'attachment',
+ 'post_title' => 'An Attachment!',
+ 'post_status' => 'inherit',
+ ) );
+
+ $attachment = get_post( $attachment_id );
+
+ $this->assertSame( home_url( user_trailingslashit( $attachment->post_name ) ), get_permalink( $attachment_id ) );
+ }
+
+ /**
+ * @ticket 1914
+ */
+ public function test_attachment_attached_to_non_existent_post_type_has_a_pretty_permalink() {
+ global $wp_rewrite, $wp_post_types;
+ $wp_rewrite->set_permalink_structure('/%year%/%monthnum%/%day%/%postname%/');
+
+ register_post_type( 'not_a_post_type', array( 'public' => true ) );
+
+ $wp_rewrite->flush_rules();
+
+ $post_id = $this->factory->post->create( array( 'post_type' => 'not_a_post_type' ) );
+
+ $attachment_id = $this->factory->attachment->create_object( 'image.jpg', $post_id, array(
+ 'post_mime_type' => 'image/jpeg',
+ 'post_type' => 'attachment',
+ 'post_title' => 'An Attachment!',
+ 'post_status' => 'inherit',
+ ) );
+
+ $attachment = get_post( $attachment_id );
+
+ $this->assertSame( get_permalink( $post_id ) . user_trailingslashit( $attachment->post_name ), get_permalink( $attachment_id ) );
+
+ foreach( $wp_post_types as $id => $pt ) {
+ if ( 'not_a_post_type' === $pt->name ) {
+ unset( $wp_post_types[ $id ] );
+ break;
+ }
+ }
+
+ $this->assertSame( home_url( user_trailingslashit( $attachment->post_name ) ), get_permalink( $attachment_id ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>