<!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>[50282] trunk: Canonical: Rename `wp_force_plain_ugly_permalink()` to match UI terminology.</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/50282">50282</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/50282","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>2021-02-10 05:38:23 +0000 (Wed, 10 Feb 2021)</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'>Canonical: Rename `wp_force_plain_ugly_permalink()` to match UI terminology.
Rename `wp_force_plain_ugly_permalink()` to `wp_force_plain_post_permalink()` to match terminology used in the WordPress dashboard.
Follow up to <a href="https://core.trac.wordpress.org/changeset/50132">[50132]</a>.
Props SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/5272">#5272</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="#trunktestsphpunittestscanonicalpostStatusphp">trunk/tests/phpunit/tests/canonical/postStatus.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 2021-02-09 20:38:37 UTC (rev 50281)
+++ trunk/src/wp-admin/includes/post.php 2021-02-10 05:38:23 UTC (rev 50282)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1357,7 +1357,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $original_date = $post->post_date;
</span><span class="cx" style="display: block; padding: 0 10px"> $original_name = $post->post_name;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Hack: get_permalink() would return ugly permalink for drafts, so we will fake that our post is published.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Hack: get_permalink() would return plain permalink for drafts, so we will fake that our post is published.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ), true ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post->post_status = 'publish';
</span><span class="cx" style="display: block; padding: 0 10px"> $post->post_name = sanitize_title( $post->post_name ? $post->post_name : $post->post_title, $post->ID );
</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 2021-02-09 20:38:37 UTC (rev 50281)
+++ trunk/src/wp-includes/link-template.php 2021-02-10 05:38:23 UTC (rev 50282)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -90,7 +90,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Determine whether post should always use an ugly permalink structure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determine whether post should always use a plain permalink structure.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,9 +98,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool|null $sample Optional. Whether to force consideration based on sample links.
</span><span class="cx" style="display: block; padding: 0 10px"> * If omitted, a sample link is generated if a post object is passed
</span><span class="cx" style="display: block; padding: 0 10px"> * with the filter property set to 'sample'.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return bool Whether to use an ugly permalink structure.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return bool Whether to use a plain permalink structure.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_force_ugly_post_permalink( $post = null, $sample = null ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_force_plain_post_permalink( $post = null, $sample = null ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> null === $sample &&
</span><span class="cx" style="display: block; padding: 0 10px"> is_object( $post ) &&
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -125,14 +125,14 @@
</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"> if (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Publicly viewable links never have ugly permalinks.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Publicly viewable links never have plain permalinks.
</ins><span class="cx" style="display: block; padding: 0 10px"> is_post_status_viewable( $post_status_obj ) ||
</span><span class="cx" style="display: block; padding: 0 10px"> (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Private posts don't have ugly links if the user can read them.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Private posts don't have plain permalinks if the user can read them.
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_status_obj->private &&
</span><span class="cx" style="display: block; padding: 0 10px"> current_user_can( 'read_post', $post->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">- // Protected posts don't have ugly links if getting a sample URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Protected posts don't have plain links if getting a sample URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> ( $post_status_obj->protected && $sample )
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink &&
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ! wp_force_ugly_post_permalink( $post )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ! wp_force_plain_post_permalink( $post )
</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"> $category = '';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -329,7 +329,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = $post->post_name;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $force_ugly_link = wp_force_ugly_post_permalink( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $force_plain_link = wp_force_plain_post_permalink( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = get_post_type_object( $post->post_type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,13 +337,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $slug = get_page_uri( $post );
</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 ( ! empty( $post_link ) && ( ! $force_ugly_link || $sample ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $post_link ) && ( ! $force_plain_link || $sample ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $leavename ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_link = str_replace( "%$post->post_type%", $slug, $post_link );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $post_link = home_url( user_trailingslashit( $post_link ) );
</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 ( $post_type->query_var && ( isset( $post->post_status ) && ! $force_ugly_link ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $post_type->query_var && ( isset( $post->post_status ) && ! $force_plain_link ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_link = add_query_arg( $post_type->query_var, $slug, '' );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $post_link = add_query_arg(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -425,11 +425,11 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $force_ugly_link = wp_force_ugly_post_permalink( $post );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $force_plain_link = wp_force_plain_post_permalink( $post );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = $wp_rewrite->get_page_permastruct();
</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 ( ! empty( $link ) && ( ( isset( $post->post_status ) && ! $force_ugly_link ) || $sample ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! empty( $link ) && ( ( isset( $post->post_status ) && ! $force_plain_link ) || $sample ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $leavename ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $link = str_replace( '%pagename%', get_page_uri( $post ), $link );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -469,11 +469,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $link = false;
</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 = get_post( $post );
- $force_ugly_link = wp_force_ugly_post_permalink( $post );
- $parent_id = $post->post_parent;
- $parent = $parent_id ? get_post( $parent_id ) : false;
- $parent_valid = true; // Default for no parent.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $post = get_post( $post );
+ $force_plain_link = wp_force_plain_post_permalink( $post );
+ $parent_id = $post->post_parent;
+ $parent = $parent_id ? get_post( $parent_id ) : false;
+ $parent_valid = true; // Default for no parent.
</ins><span class="cx" style="display: block; padding: 0 10px"> if (
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_id &&
</span><span class="cx" style="display: block; padding: 0 10px"> (
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -486,7 +486,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_valid = 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 ( $force_ugly_link || ! $parent_valid ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $force_plain_link || ! $parent_valid ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $link = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $wp_rewrite->using_permalinks() && $parent ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'page' === $parent->post_type ) {
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalpostStatusphp"></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/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 2021-02-09 20:38:37 UTC (rev 50281)
+++ trunk/tests/phpunit/tests/canonical/postStatus.php 2021-02-10 05:38:23 UTC (rev 50282)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,7 +215,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Test canonical redirect does not reveal private posts presence.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 5272
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @dataProvider data_canonical_redirects_to_ugly_permalinks
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @dataProvider data_canonical_redirects_to_plain_permalinks
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $post_key Post key used for creating fixtures.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $user_role User role.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $requested Requested URL.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $expected Expected URL.
</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_canonical_redirects_to_ugly_permalinks( $post_key, $user_role, $requested, $expected ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_canonical_redirects_to_plain_permalinks( $post_key, $user_role, $requested, $expected ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> wp_set_current_user( self::$users[ $user_role ] );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->set_permalink_structure( '' );
</span><span class="cx" style="display: block; padding: 0 10px"> $post = self::$posts[ $post_key ];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,7 +239,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Data provider for test_canonical_redirects_to_ugly_permalinks.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Data provider for test_canonical_redirects_to_plain_permalinks.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array[] Array of arguments for tests {
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $post_key Post key used for creating fixtures.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -248,7 +248,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $expected Expected 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">- function data_canonical_redirects_to_ugly_permalinks() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function data_canonical_redirects_to_plain_permalinks() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $data = array();
</span><span class="cx" style="display: block; padding: 0 10px"> $all_user_list = array( 'anon', 'subscriber', 'content_author', 'editor' );
</span><span class="cx" style="display: block; padding: 0 10px"> $select_allow_list = array( 'content_author', 'editor' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,8 +263,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $all_user_post_status_keys as $post_key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $all_user_list as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values can be changed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * In the event `redirect_canonical()` is updated to redirect plain permalinks
+ * to a canonical plain version, these expected values can be changed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $data[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> "$post_key-page",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -301,8 +301,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $select_user_post_status_keys as $post_key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $select_allow_list as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values can be changed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * In the event `redirect_canonical()` is updated to redirect plain permalinks
+ * to a canonical plain version, these expected values can be changed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $data[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> "$post_key-page",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -337,8 +337,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $select_block_list as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values MUST NOT be changed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * In the event `redirect_canonical()` is updated to redirect plain permalinks
+ * to a canonical plain version, these expected values MUST NOT be changed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $data[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> "$post_key-page",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -375,8 +375,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $no_user_post_status_keys as $post_key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $all_user_list as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values MUST NOT be changed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * In the event `redirect_canonical()` is updated to redirect plain permalinks
+ * to a canonical plain version, these expected values MUST NOT be changed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $data[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> "$post_key-page",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -413,8 +413,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( array( 'trash' ) as $post_key ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $all_user_list as $user ) {
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * In the event `redirect_canonical()` is updated to redirect ugly permalinks
- * to a canonical ugly version, these expected values MUST NOT be changed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * In the event `redirect_canonical()` is updated to redirect plain permalinks
+ * to a canonical plain version, these expected values MUST NOT be changed.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $data[] = array(
</span><span class="cx" style="display: block; padding: 0 10px"> "$post_key-page",
</span></span></pre>
</div>
</div>
</body>
</html>