<!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>[41991] trunk: Canonical: Strip trailing punctuation from permalinks.</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/41991">41991</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/41991","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-24 14:17:22 +0000 (Tue, 24 Oct 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Canonical: Strip trailing punctuation from permalinks.
Previously attempted in <a href="https://core.trac.wordpress.org/changeset/40256">[40256]</a>, which caused the test for decoded curly quotes to fail in some environments.
`$_SERVER['REQUEST_URI']` contains the encoded URI, so this version removes the failing tests and only checks for encoded curly quotes.
Props joostdevalk, lancewillett, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/20383">#20383</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludescanonicalphp">trunk/src/wp-includes/canonical.php</a></li>
<li><a href="#trunktestsphpunittestscanonicalnoRewritephp">trunk/tests/phpunit/tests/canonical/noRewrite.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 2017-10-24 13:24:43 UTC (rev 41990)
+++ trunk/src/wp-includes/canonical.php 2017-10-24 14:17:22 UTC (rev 41991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -392,12 +392,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // trailing /index.php
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['path'] = preg_replace('|/' . preg_quote( $wp_rewrite->index, '|' ) . '/*?$|', '/', $redirect['path']);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove trailing spaces from the path
- $redirect['path'] = preg_replace( '#(%20| )+$#', '', $redirect['path'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $punctuation_pattern = implode( '|', array_map( 'preg_quote', array(
+ ' ', '%20', // space
+ '!', '%21', // exclamation mark
+ '"', '%22', // double quote
+ "'", '%27', // single quote
+ '(', '%28', // opening bracket
+ ')', '%29', // closing bracket
+ ',', '%2C', // comma
+ '.', '%2E', // period
+ ';', '%3B', // semicolon
+ '{', '%7B', // opening curly bracket
+ '}', '%7D', // closing curly bracket
+ '%E2%80%9C', // opening curly quote
+ '%E2%80%9D', // closing curly quote
+ ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove trailing spaces and end punctuation from the path.
+ $redirect['path'] = preg_replace( "#($punctuation_pattern)+$#", '', $redirect['path'] );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( !empty( $redirect['query'] ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Remove trailing spaces from certain terminating query string args
- $redirect['query'] = preg_replace( '#((p|page_id|cat|tag)=[^&]*?)(%20| )+$#', '$1', $redirect['query'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Remove trailing spaces and end punctuation from certain terminating query string args.
+ $redirect['query'] = preg_replace( "#((p|page_id|cat|tag)=[^&]*?)($punctuation_pattern)+$#", '$1', $redirect['query'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clean up empty query strings
</span><span class="cx" style="display: block; padding: 0 10px"> $redirect['query'] = trim(preg_replace( '#(^|&)(p|page_id|cat|tag)=?(&|$)#', '&', $redirect['query']), '&');
</span></span></pre></div>
<a id="trunktestsphpunittestscanonicalnoRewritephp"></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/noRewrite.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/canonical/noRewrite.php 2017-10-24 13:24:43 UTC (rev 41990)
+++ trunk/tests/phpunit/tests/canonical/noRewrite.php 2017-10-24 14:17:22 UTC (rev 41991)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,15 +46,63 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Strip an existing but incorrect post_type arg
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?post_type=page&page_id=1', '/?p=1' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( '/?p=358 ', array('url' => '/?p=358', 'qv' => array('p' => '358') ) ), // Trailing spaces
- array( '/?p=358%20', array('url' => '/?p=358', 'qv' => array('p' => '358') ) ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trailing spaces and punctuation in query string args.
+ array( '/?p=358 ', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // space
+ array( '/?p=358%20', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded space
+ array( '/?p=358!', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // exclamation mark
+ array( '/?p=358%21', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded exclamation mark
+ array( '/?p=358"', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // double quote
+ array( '/?p=358%22', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded double quote
+ array( '/?p=358\'', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // single quote
+ array( '/?p=358%27', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded single quote
+ array( '/?p=358(', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // opening bracket
+ array( '/?p=358%28', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded opening bracket
+ array( '/?p=358)', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // closing bracket
+ array( '/?p=358%29', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded closing bracket
+ array( '/?p=358,', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // comma
+ array( '/?p=358%2C', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded comma
+ array( '/?p=358.', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // period
+ array( '/?p=358%2E', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded period
+ array( '/?p=358;', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // semicolon
+ array( '/?p=358%3B', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded semicolon
+ array( '/?p=358{', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // opening curly bracket
+ array( '/?p=358%7B', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded opening curly bracket
+ array( '/?p=358}', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // closing curly bracket
+ array( '/?p=358%7D', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded closing curly bracket
+ array( '/?p=358%E2%80%9C', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded opening curly quote
+ array( '/?p=358%E2%80%9D', array( 'url' => '/?p=358', 'qv' => array( 'p' => '358' ) ), 20383 ), // encoded closing curly quote
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Trailing spaces and punctuation in permalinks.
+ array( '/page/2/ ', '/page/2/', 20383 ), // space
+ array( '/page/2/%20', '/page/2/', 20383 ), // encoded space
+ array( '/page/2/!', '/page/2/', 20383 ), // exclamation mark
+ array( '/page/2/%21', '/page/2/', 20383 ), // encoded exclamation mark
+ array( '/page/2/"', '/page/2/', 20383 ), // double quote
+ array( '/page/2/%22', '/page/2/', 20383 ), // encoded double quote
+ array( '/page/2/\'', '/page/2/', 20383 ), // single quote
+ array( '/page/2/%27', '/page/2/', 20383 ), // encoded single quote
+ array( '/page/2/(', '/page/2/', 20383 ), // opening bracket
+ array( '/page/2/%28', '/page/2/', 20383 ), // encoded opening bracket
+ array( '/page/2/)', '/page/2/', 20383 ), // closing bracket
+ array( '/page/2/%29', '/page/2/', 20383 ), // encoded closing bracket
+ array( '/page/2/,', '/page/2/', 20383 ), // comma
+ array( '/page/2/%2C', '/page/2/', 20383 ), // encoded comma
+ array( '/page/2/.', '/page/2/', 20383 ), // period
+ array( '/page/2/%2E', '/page/2/', 20383 ), // encoded period
+ array( '/page/2/;', '/page/2/', 20383 ), // semicolon
+ array( '/page/2/%3B', '/page/2/', 20383 ), // encoded semicolon
+ array( '/page/2/{', '/page/2/', 20383 ), // opening curly bracket
+ array( '/page/2/%7B', '/page/2/', 20383 ), // encoded opening curly bracket
+ array( '/page/2/}', '/page/2/', 20383 ), // closing curly bracket
+ array( '/page/2/%7D', '/page/2/', 20383 ), // encoded closing curly bracket
+ array( '/page/2/%E2%80%9C', '/page/2/', 20383 ), // encoded opening curly quote
+ array( '/page/2/%E2%80%9D', '/page/2/', 20383 ), // encoded closing curly quote
+
</ins><span class="cx" style="display: block; padding: 0 10px"> array( '/?page_id=1', '/?p=1' ), // redirect page_id to p (should cover page_id|p|attachment_id to one another
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?page_id=1&post_type=revision', '/?p=1' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?feed=rss2&p=1', '/?feed=rss2&p=1', 21841 ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( '/?feed=rss&p=1', '/?feed=rss2&p=1', 24623 ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</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></pre>
</div>
</div>
</body>
</html>