<!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>[49622] trunk: Permalinks: Prevent attachment pages 404ing following [49563].</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 { white-space: pre-line; 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/49622">49622</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/49622","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>peterwilsoncc</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2020-11-17 03:27:07 +0000 (Tue, 17 Nov 2020)</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: Prevent attachment pages 404ing following <a href="https://core.trac.wordpress.org/changeset/49563">[49563]</a>.
This largely reverts <a href="https://core.trac.wordpress.org/changeset/49563">[49563]</a> due to attachment pages returning 404: File not found errors when they use the `inherit` status.
Permalink changes to attachment pages are retained when they are descendants of trashed or deleted posts.
Props Toro_Unit, helen, johnbillion, peterwilsoncc.
Fixes <a href="https://core.trac.wordpress.org/ticket/51776">#51776</a>.
See <a href="https://core.trac.wordpress.org/ticket/5272">#5272</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunktestsphpunittestsmediaphp">trunk/tests/phpunit/tests/media.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunktestsphpunittestscanonicalpostStatusphp">trunk/tests/phpunit/tests/canonical/postStatus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludescanonicalphp"></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/canonical.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/canonical.php 2020-11-17 00:58:33 UTC (rev 49621)
+++ trunk/src/wp-includes/canonical.php 2020-11-17 03:27:07 UTC (rev 49622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,7 +77,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect = $original;
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = false;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = false;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Notice fixing.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! isset( $redirect['path'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -103,7 +102,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_feed() && $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_post_comments_feed_link( $post_id, get_query_var( 'feed' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( $post_id );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = _remove_qs_args_if_not_in_url(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,7 +126,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"> $redirect_url = get_permalink( $post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( $post_id );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = _remove_qs_args_if_not_in_url(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -153,7 +150,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_type_obj->public && 'auto-draft' !== $redirect_post->post_status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_permalink( $redirect_post );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( $redirect_post );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = _remove_qs_args_if_not_in_url(
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'],
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,7 +197,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_permalink( $post_id );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( $post_id );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['path'] = rtrim( $redirect['path'], (int) get_query_var( 'page' ) . '/' );
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = remove_query_arg( 'page', $redirect['query'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -228,7 +223,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $_GET['attachment_id'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_attachment_link( get_query_var( 'attachment_id' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( get_query_var( 'attachment_id' ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = remove_query_arg( 'attachment_id', $redirect['query'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -235,11 +229,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_attachment_link();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post();
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_single() && ! empty( $_GET['p'] ) && ! $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_permalink( get_query_var( 'p' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( get_query_var( 'p' ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = remove_query_arg( array( 'p', 'post_type' ), $redirect['query'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -246,7 +238,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_single() && ! empty( $_GET['name'] ) && ! $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_permalink( $wp_query->get_queried_object_id() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( $wp_query->get_queried_object_id() );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = remove_query_arg( 'name', $redirect['query'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,7 +244,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_page() && ! empty( $_GET['page_id'] ) && ! $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_permalink( get_query_var( 'page_id' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( get_query_var( 'page_id' ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = remove_query_arg( 'page_id', $redirect['query'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -266,7 +256,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && 'page' === get_option( 'show_on_front' ) && get_query_var( 'page_id' ) === (int) get_option( 'page_for_posts' )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_permalink( get_option( 'page_for_posts' ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( get_option( 'page_for_posts' ) );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = remove_query_arg( 'page_id', $redirect['query'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +310,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> && $wpdb->get_var( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE $wpdb->posts.post_author = %d AND $wpdb->posts.post_status = 'publish' LIMIT 1", $author->ID ) )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_author_posts_url( $author->ID, $author->user_nicename );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = $author;
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = remove_query_arg( 'author', $redirect['query'] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,7 +385,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> || ! has_term( $category->term_id, 'category', $wp_query->get_queried_object_id() )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_permalink( $wp_query->get_queried_object_id() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( $wp_query->get_queried_object_id() );
</del><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><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,7 +395,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $redirect_url ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect_url = get_permalink( get_queried_object_id() );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $redirect_obj = get_post( get_queried_object_id() );
</del><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 ( $page > 1 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -754,32 +740,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $requested_url = preg_replace_callback( '|%[a-fA-F0-9][a-fA-F0-9]|', 'lowercase_octets', $requested_url );
</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 (
- $redirect_obj &&
- is_a( $redirect_obj, 'WP_Post' )
- ) {
- $post_status_obj = get_post_status_object( get_post_status( $redirect_obj ) );
- if (
- // Unviewable post types are never redirected.
- ! is_post_type_viewable( $redirect_obj->post_type ) ||
- // Internal or protected posts never redirect.
- $post_status_obj->internal ||
- $post_status_obj->protected ||
- (
- // Don't redirect a non-public post...
- ! $post_status_obj->public &&
- (
- // ...unless it's private and the logged in user has access.
- $post_status_obj->private &&
- ! current_user_can( 'read_post', $redirect_obj->ID )
- )
- )
- ) {
- $redirect_obj = false;
- $redirect_url = false;
- }
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the canonical redirect URL.
</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 2020-11-17 00:58:33 UTC (rev 49621)
+++ trunk/src/wp-includes/link-template.php 2020-11-17 03:27:07 UTC (rev 49622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -164,7 +164,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename );
</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 ( $permalink && ! in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ), true ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (
+ $permalink &&
+ ! in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future', 'trash' ), true )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $category = '';
</span><span class="cx" style="display: block; padding: 0 10px"> if ( strpos( $permalink, '%category%' ) !== false ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -420,17 +423,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent = 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 ( $parent ) {
- $parent_status_obj = get_post_status_object( get_post_status( $post->post_parent ) );
- if (
- ! is_post_type_viewable( get_post_type( $post->post_parent ) ) ||
- $parent_status_obj->internal ||
- $parent_status_obj->protected
- ) {
- $parent = false;
- }
- }
-
</del><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="cx" style="display: block; padding: 0 10px"> $parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front.
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpostStatusphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/tests/phpunit/tests/canonical/postStatus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/postStatus.php 2020-11-17 00:58:33 UTC (rev 49621)
+++ trunk/tests/phpunit/tests/canonical/postStatus.php 2020-11-17 03:27:07 UTC (rev 49622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,970 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-
-/**
- * @group canonical
- * @group rewrite
- * @group query
- */
-class Tests_Canonical_PostStatus extends WP_Canonical_UnitTestCase {
-
- /**
- * User IDs.
- *
- * @var array
- */
- public static $users;
-
- /**
- * Post Objects.
- *
- * @var array
- */
- public static $posts;
-
- public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
- self::setup_custom_types();
- self::$users = array(
- 'anon' => 0,
- 'subscriber' => $factory->user->create( array( 'role' => 'subscriber' ) ),
- 'content_author' => $factory->user->create( array( 'role' => 'author' ) ),
- 'editor' => $factory->user->create( array( 'role' => 'editor' ) ),
- );
-
- $post_statuses = array( 'publish', 'future', 'draft', 'pending', 'private', 'auto-draft', 'a-private-status' );
- foreach ( $post_statuses as $post_status ) {
- $post_date = '';
- if ( 'future' === $post_status ) {
- $post_date = strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 year' ) );
- }
-
- self::$posts[ $post_status ] = $factory->post->create_and_get(
- array(
- 'post_type' => 'post',
- 'post_title' => "$post_status post",
- 'post_name' => "$post_status-post",
- 'post_status' => $post_status,
- 'post_content' => "Prevent canonical redirect exposing post slugs.\n\n<!--nextpage-->Page 2",
- 'post_author' => self::$users['content_author'],
- 'post_date' => $post_date,
- )
- );
-
- // Add fake attachment to the post (file upload not needed).
- self::$posts[ "$post_status-attachment" ] = $factory->post->create_and_get(
- array(
- 'post_type' => 'attachment',
- 'post_title' => "$post_status inherited attachment",
- 'post_name' => "$post_status-inherited-attachment",
- 'post_status' => 'inherit',
- 'post_content' => "Prevent canonical redirect exposing post via attachments.\n\n<!--nextpage-->Page 2",
- 'post_author' => self::$users['content_author'],
- 'post_parent' => self::$posts[ $post_status ]->ID,
- 'post_date' => $post_date,
- )
- );
-
- // Set up a page with same.
- self::$posts[ "$post_status-page" ] = $factory->post->create_and_get(
- array(
- 'post_type' => 'page',
- 'post_title' => "$post_status page",
- 'post_name' => "$post_status-page",
- 'post_status' => $post_status,
- 'post_content' => "Prevent canonical redirect exposing page slugs.\n\n<!--nextpage-->Page 2",
- 'post_author' => self::$users['content_author'],
- 'post_date' => $post_date,
- )
- );
- }
-
- // Create a public CPT using a private status.
- self::$posts['a-public-cpt'] = $factory->post->create_and_get(
- array(
- 'post_type' => 'a-public-cpt',
- 'post_title' => 'a-public-cpt',
- 'post_name' => 'a-public-cpt',
- 'post_status' => 'private',
- 'post_content' => 'Prevent canonical redirect exposing a-public-cpt titles.',
- 'post_author' => self::$users['content_author'],
- )
- );
-
- // Add fake attachment to the public cpt (file upload not needed).
- self::$posts['a-public-cpt-attachment'] = $factory->post->create_and_get(
- array(
- 'post_type' => 'attachment',
- 'post_title' => 'a-public-cpt post inherited attachment',
- 'post_name' => 'a-public-cpt-inherited-attachment',
- 'post_status' => 'inherit',
- 'post_content' => "Prevent canonical redirect exposing post via attachments.\n\n<!--nextpage-->Page 2",
- 'post_author' => self::$users['content_author'],
- 'post_parent' => self::$posts['a-public-cpt']->ID,
- )
- );
-
- // Create a private CPT with a public status.
- self::$posts['a-private-cpt'] = $factory->post->create_and_get(
- array(
- 'post_type' => 'a-private-cpt',
- 'post_title' => 'a-private-cpt',
- 'post_name' => 'a-private-cpt',
- 'post_status' => 'publish',
- 'post_content' => 'Prevent canonical redirect exposing a-private-cpt titles.',
- 'post_author' => self::$users['content_author'],
- )
- );
-
- // Add fake attachment to the private cpt (file upload not needed).
- self::$posts['a-private-cpt-attachment'] = $factory->post->create_and_get(
- array(
- 'post_type' => 'attachment',
- 'post_title' => 'a-private-cpt post inherited attachment',
- 'post_name' => 'a-private-cpt-inherited-attachment',
- 'post_status' => 'inherit',
- 'post_content' => "Prevent canonical redirect exposing post via attachments.\n\n<!--nextpage-->Page 2",
- 'post_author' => self::$users['content_author'],
- 'post_parent' => self::$posts['a-private-cpt']->ID,
- )
- );
-
- // Post for trashing.
- self::$posts['trash'] = $factory->post->create_and_get(
- array(
- 'post_type' => 'post',
- 'post_title' => 'trash post',
- 'post_name' => 'trash-post',
- 'post_status' => 'publish',
- 'post_content' => "Prevent canonical redirect exposing post slugs.\n\n<!--nextpage-->Page 2",
- 'post_author' => self::$users['content_author'],
- )
- );
-
- self::$posts['trash-attachment'] = $factory->post->create_and_get(
- array(
- 'post_type' => 'attachment',
- 'post_title' => 'trash post inherited attachment',
- 'post_name' => 'trash-post-inherited-attachment',
- 'post_status' => 'inherit',
- 'post_content' => "Prevent canonical redirect exposing post via attachments.\n\n<!--nextpage-->Page 2",
- 'post_author' => self::$users['content_author'],
- 'post_parent' => self::$posts['trash']->ID,
- )
- );
-
- // Page for trashing.
- self::$posts['trash-page'] = $factory->post->create_and_get(
- array(
- 'post_type' => 'page',
- 'post_title' => 'trash page',
- 'post_name' => 'trash-page',
- 'post_status' => 'publish',
- 'post_content' => "Prevent canonical redirect exposing page slugs.\n\n<!--nextpage-->Page 2",
- 'post_author' => self::$users['content_author'],
- )
- );
- wp_trash_post( self::$posts['trash']->ID );
- wp_trash_post( self::$posts['trash-page']->ID );
- }
-
- function setUp() {
- parent::setUp();
- self::setup_custom_types();
- }
-
- /**
- * Set up a custom post type and private status.
- *
- * This needs to be called both in the class setup and
- * test setup.
- */
- public static function setup_custom_types() {
- // Register public custom post type.
- register_post_type(
- 'a-public-cpt',
- array(
- 'public' => true,
- 'rewrite' => array(
- 'slug' => 'a-public-cpt',
- ),
- )
- );
-
- // Register private custom post type.
- register_post_type(
- 'a-private-cpt',
- array(
- 'public' => false,
- 'rewrite' => array(
- 'slug' => 'a-private-cpt',
- ),
- )
- );
-
- // Register custom private post status.
- register_post_status(
- 'a-private-status',
- array(
- 'private' => true,
- )
- );
- }
-
- /**
- * Test canonical redirect does not reveal private posts presence.
- *
- * @ticket 5272
- * @dataProvider data_canonical_redirects_to_ugly_permalinks
- *
- * @param string $post_key Post key used for creating fixtures.
- * @param string $user_role User role.
- * @param string $requested Requested URL.
- * @param string $expected Expected URL.
- */
- public function test_canonical_redirects_to_ugly_permalinks( $post_key, $user_role, $requested, $expected ) {
- wp_set_current_user( self::$users[ $user_role ] );
- $this->set_permalink_structure( '' );
- $post = self::$posts[ $post_key ];
- clean_post_cache( $post->ID );
-
- /*
- * The dataProvider runs before the fixures are set up, therefore the
- * post object IDs are placeholders that needs to be replaced.
- */
- $requested = str_replace( '%ID%', $post->ID, $requested );
- $expected = str_replace( '%ID%', $post->ID, $expected );
-
- $this->assertCanonical( $requested, $expected );
- }
-
- /**
- * Data provider for test_canonical_redirects_to_ugly_permalinks.
- *
- * @return array[] Array of arguments for tests {
- * @type string $post_key Post key used for creating fixtures.
- * @type string $user_role User role.
- * @type string $requested Requested URL.
- * @type string $expected Expected URL.
- * }
- */
- function data_canonical_redirects_to_ugly_permalinks() {
- $data = array();
- $all_user_list = array( 'anon', 'subscriber', 'content_author', 'editor' );
- $select_allow_list = array( 'content_author', 'editor' );
- $select_block_list = array( 'anon', 'subscriber' );
- // All post/page keys
- $all_user_post_status_keys = array( 'publish' );
- $select_user_post_status_keys = array( 'private', 'a-private-status' );
- $no_user_post_status_keys = array( 'future', 'draft', 'pending', 'auto-draft' ); // Excludes trash for attachment rules.
- $select_user_post_type_keys = array( 'a-public-cpt' );
- $no_user_post_type_keys = array( 'a-private-cpt' );
-
- foreach ( $all_user_post_status_keys as $post_key ) {
- foreach ( $all_user_list as $user ) {
- /*
- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values can be changed.
- */
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- '/?post_type=page&p=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/?name=$post_key-post",
- );
-
- // Ensure rss redirects to rss2.
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss2&p=%ID%',
- );
-
- // Ensure rss redirects to rss2.
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- '/?feed=rss2&page_id=%ID%',
- );
- }
- }
-
- foreach ( $select_user_post_status_keys as $post_key ) {
- foreach ( $select_allow_list as $user ) {
- /*
- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values can be changed.
- */
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- '/?post_type=page&p=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/?name=$post_key-post",
- );
-
- // Ensure rss redirects to rss2.
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss2&p=%ID%',
- );
-
- // Ensure rss redirects to rss2.
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- '/?feed=rss2&page_id=%ID%',
- );
- }
-
- foreach ( $select_block_list as $user ) {
- /*
- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values MUST NOT be changed.
- */
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- '/?post_type=page&p=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/?name=$post_key-post",
- );
-
- // Ensure post's existence is not demonstrated by changing rss to rss2.
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
-
- // Ensure post's existence is not demonstrated by changing rss to rss2.
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- '/?feed=rss&page_id=%ID%',
- );
- }
- }
-
- foreach ( $no_user_post_status_keys as $post_key ) {
- foreach ( $all_user_list as $user ) {
- /*
- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values MUST NOT be changed.
- */
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- '/?post_type=page&p=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/?name=$post_key-post",
- );
-
- // Ensure post's existence is not demonstrated by changing rss to rss2.
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
-
- // Ensure post's existence is not demonstrated by changing rss to rss2.
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- '/?feed=rss&page_id=%ID%',
- );
- }
- }
-
- foreach ( array( 'trash' ) as $post_key ) {
- foreach ( $all_user_list as $user ) {
- /*
- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values MUST NOT be changed.
- */
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- '/?post_type=page&p=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/?name=$post_key-post",
- );
-
- // Ensure post's existence is not demonstrated by changing rss to rss2.
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
-
- // Ensure post's existence is not demonstrated by changing rss to rss2.
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- '/?feed=rss&page_id=%ID%',
- );
- }
- }
-
- foreach ( $select_user_post_type_keys as $post_key ) {
- foreach ( $select_allow_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- '/?a-public-cpt=a-public-cpt',
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- '/?attachment_id=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key&post_type=$post_key",
- "/?name=$post_key&post_type=$post_key",
- );
-
- // Ensure rss is replaced by rss2.
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?a-public-cpt=a-public-cpt&feed=rss2',
- );
- }
-
- foreach ( $select_block_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- '/?p=%ID%',
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- '/?attachment_id=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key&post_type=$post_key",
- "/?name=$post_key&post_type=$post_key",
- );
-
- // Ensure rss is not replaced with rss2.
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
- }
- }
-
- foreach ( $no_user_post_type_keys as $post_key ) {
- foreach ( $all_user_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- '/?p=%ID%',
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- '/?attachment_id=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key&post_type=$post_key",
- "/?name=$post_key&post_type=$post_key",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
- }
- }
-
- return $data;
- }
-
- /**
- * Test canonical redirect does not reveal private slugs.
- *
- * @ticket 5272
- * @dataProvider data_canonical_redirects_to_pretty_permalinks
- *
- * @param string $post_key Post key used for creating fixtures.
- * @param string $user_role User role.
- * @param string $requested Requested URL.
- * @param string $expected Expected URL.
- */
- public function test_canonical_redirects_to_pretty_permalinks( $post_key, $user_role, $requested, $expected ) {
- wp_set_current_user( self::$users[ $user_role ] );
- $this->set_permalink_structure( '/%postname%/' );
- $post = self::$posts[ $post_key ];
- clean_post_cache( $post->ID );
-
- /*
- * The dataProvider runs before the fixures are set up, therefore the
- * post object IDs are placeholders that needs to be replaced.
- */
- $requested = str_replace( '%ID%', $post->ID, $requested );
- $expected = str_replace( '%ID%', $post->ID, $expected );
-
- $this->assertCanonical( $requested, $expected );
- }
-
- /**
- * Data provider for test_canonical_redirects_to_pretty_permalinks.
- *
- * @return array[] Array of arguments for tests {
- * @type string $post_key Post key used for creating fixtures.
- * @type string $user_role User role.
- * @type string $requested Requested URL.
- * @type string $expected Expected URL.
- * }
- */
- function data_canonical_redirects_to_pretty_permalinks() {
- $data = array();
- $all_user_list = array( 'anon', 'subscriber', 'content_author', 'editor' );
- $select_allow_list = array( 'content_author', 'editor' );
- $select_block_list = array( 'anon', 'subscriber' );
- // All post/page keys
- $all_user_post_status_keys = array( 'publish' );
- $select_user_post_status_keys = array( 'private', 'a-private-status' );
- $no_user_post_status_keys = array( 'future', 'draft', 'pending', 'auto-draft' ); // Excludes trash for attachment rules.
- $select_user_post_type_keys = array( 'a-public-cpt' );
- $no_user_post_type_keys = array( 'a-private-cpt' );
-
- foreach ( $all_user_post_status_keys as $post_key ) {
- foreach ( $all_user_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- "/$post_key-post/",
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- "/$post_key-post/$post_key-inherited-attachment/",
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- "/$post_key-page/",
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?page_id=%ID%',
- "/$post_key-page/",
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/$post_key-post/",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- "/$post_key-post/feed/",
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- "/$post_key-page/feed/",
- );
- }
- }
-
- foreach ( $select_user_post_status_keys as $post_key ) {
- foreach ( $select_allow_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- "/$post_key-post/",
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- "/$post_key-post/$post_key-inherited-attachment/",
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- "/$post_key-page/",
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?page_id=%ID%',
- "/$post_key-page/",
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/$post_key-post/",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- "/$post_key-post/feed/",
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- "/$post_key-page/feed/",
- );
- }
-
- foreach ( $select_block_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- '/?p=%ID%',
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- '/?attachment_id=%ID%',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- '/?post_type=page&p=%ID%',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?page_id=%ID%',
- '/?page_id=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/?name=$post_key-post",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- '/?feed=rss&page_id=%ID%',
- );
- }
- }
-
- foreach ( $select_user_post_type_keys as $post_key ) {
- foreach ( $select_allow_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- "/$post_key/$post_key/",
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- "/$post_key/$post_key/$post_key-inherited-attachment/",
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key&post_type=$post_key",
- "/$post_key/$post_key/?post_type=$post_key",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- "/$post_key/$post_key/feed/",
- );
- }
-
- foreach ( $select_block_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- '/?p=%ID%',
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- '/?attachment_id=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key&post_type=$post_key",
- "/?name=$post_key&post_type=$post_key",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
- }
- }
-
- foreach ( $no_user_post_type_keys as $post_key ) {
- foreach ( $all_user_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- '/?p=%ID%',
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- "/$post_key-inherited-attachment/",
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key&post_type=$post_key",
- "/?name=$post_key&post_type=$post_key",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
- }
- }
-
- foreach ( $no_user_post_status_keys as $post_key ) {
- foreach ( $all_user_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- '/?p=%ID%',
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- '/?attachment_id=%ID%',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- '/?post_type=page&p=%ID%',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?page_id=%ID%',
- '/?page_id=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/?name=$post_key-post",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- '/?feed=rss&page_id=%ID%',
- );
- }
- }
-
- foreach ( array( 'trash' ) as $post_key ) {
- foreach ( $all_user_list as $user ) {
- $data[] = array(
- $post_key,
- $user,
- '/?p=%ID%',
- '/?p=%ID%',
- );
-
- $data[] = array(
- "$post_key-attachment",
- $user,
- '/?attachment_id=%ID%',
- '/trash-post-inherited-attachment/',
- );
-
- $data[] = array(
- "$post_key",
- $user,
- '/trash-post/trash-post-inherited-attachment/',
- '/trash-post-inherited-attachment/',
- );
-
- $data[] = array(
- "$post_key",
- $user,
- '/trash-post__trashed/trash-post-inherited-attachment/',
- '/trash-post-inherited-attachment/',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?post_type=page&p=%ID%',
- '/?post_type=page&p=%ID%',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?page_id=%ID%',
- '/?page_id=%ID%',
- );
-
- $data[] = array(
- $post_key,
- $user,
- "/?name=$post_key-post",
- "/?name=$post_key-post",
- );
-
- $data[] = array(
- $post_key,
- $user,
- '/?feed=rss&p=%ID%',
- '/?feed=rss&p=%ID%',
- );
-
- $data[] = array(
- "$post_key-page",
- $user,
- '/?feed=rss&page_id=%ID%',
- '/?feed=rss&page_id=%ID%',
- );
- }
- }
-
- return $data;
- }
-}
</del></span></pre></div>
<a id="trunktestsphpunittestsmediaphp"></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/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/media.php 2020-11-17 00:58:33 UTC (rev 49621)
+++ trunk/tests/phpunit/tests/media.php 2020-11-17 03:27:07 UTC (rev 49622)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $large_id;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $_sizes;
</span><span class="cx" style="display: block; padding: 0 10px"> protected static $large_filename = 'test-image-large.jpg';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ protected static $post_ids;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
</span><span class="cx" style="display: block; padding: 0 10px"> self::$_sizes = wp_get_additional_image_sizes();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -15,6 +16,35 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $filename = DIR_TESTDATA . '/images/' . self::$large_filename;
</span><span class="cx" style="display: block; padding: 0 10px"> self::$large_id = $factory->attachment->create_upload_object( $filename );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ $post_statuses = array( 'publish', 'future', 'draft', 'auto-draft', 'trash' );
+ foreach ( $post_statuses as $post_status ) {
+ $date = '';
+ if ( 'future' === $post_status ) {
+ strftime( '%Y-%m-%d %H:%M:%S', strtotime( '+1 year' ) );
+ }
+
+ self::$post_ids[ $post_status ] = $factory->post->create(
+ array(
+ 'post_status' => 'trash' === $post_status ? 'publish' : $post_status,
+ 'post_date' => $date,
+ 'post_name' => "$post_status-post",
+ )
+ );
+
+ // Attachments without media.
+ self::$post_ids[ "$post_status-attachment" ] = $factory->attachment->create_object(
+ array(
+ 'post_parent' => self::$post_ids[ $post_status ],
+ 'post_status' => 'inherit',
+ 'post_name' => "$post_status-attachment",
+ 'post_date' => $date,
+ )
+ );
+ }
+
+ // Trash the trash post.
+ wp_trash_post( self::$post_ids['trash'] );
</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"> public static function wpTearDownAfterClass() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3023,6 +3053,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertNotContains( '<a ', $actual );
</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">+ /**
+ * Test attachment permalinks based on parent post status.
+ *
+ * @dataProvider data_attachment_permalinks_based_on_parent_status
+ * @ticket 51776
+ *
+ * @param string $post_key Post as keyed in the shared fixture array.
+ * @param string $expected Expected result.
+ * @param bool $expected_404 Whether the page is expected to return a 404 result.
+ *
+ */
+ function test_attachment_permalinks_based_on_parent_status( $post_key, $expected, $expected_404 ) {
+ $this->set_permalink_structure( '/%postname%' );
+ $post = get_post( self::$post_ids[ $post_key ] );
+
+ /*
+ * The dataProvider runs before the fixures are set up, therefore the
+ * post object IDs are placeholders that needs to be replaced.
+ */
+ $expected = home_url( str_replace( '%ID%', $post->ID, $expected ) );
+
+ $this->assertSame( $expected, get_permalink( $post ) );
+ $this->go_to( get_permalink( $post ) );
+ $this->assertSame( $expected_404, is_404() );
+ }
+
+ /**
+ * Data provider for test_attachment_permalinks_based_on_parent_status().
+ *
+ * @return array[] {
+ * @type string $post_key Post as keyed in the shared fixture array.
+ * @type string $expected Expected result.
+ * $type bool $expected_404 Whether the page is expected to return a 404 result.
+ * }
+ */
+ function data_attachment_permalinks_based_on_parent_status() {
+ return array(
+ array( 'draft-attachment', '/?attachment_id=%ID%', true ),
+ array( 'publish-attachment', '/publish-post/publish-attachment', false ),
+ array( 'future-attachment', '/future-post/future-attachment', false ),
+ array( 'auto-draft-attachment', '/?attachment_id=%ID%', true ),
+ array( 'trash-attachment', '/?attachment_id=%ID%', false ),
+ );
+ }
</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"> /**
</span></span></pre>
</div>
</div>
</body>
</html>