<!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>[27344] trunk: Strip backslashes, not just forward slashes, from untrailingslashit().</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/27344">27344</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-03-01 21:44:43 +0000 (Sat, 01 Mar 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Strip backslashes, not just forward slashes, from untrailingslashit().

trailingslashit() will now remove any forward or backslashes from the end of a string before appending a forward slash.

props knutsp, willmot.
fixes <a href="http://core.trac.wordpress.org/ticket/22267">#22267</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesformattingphp">trunk/src/wp-includes/formatting.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunktestsphpunittestsformattingSlashitphp">trunk/tests/phpunit/tests/formatting/Slashit.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/formatting.php (27343 => 27344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/formatting.php     2014-03-01 21:33:36 UTC (rev 27343)
+++ trunk/src/wp-includes/formatting.php        2014-03-01 21:44:43 UTC (rev 27344)
</span><span class="lines">@@ -1482,35 +1482,34 @@
</span><span class="cx"> /**
</span><span class="cx">  * Appends a trailing slash.
</span><span class="cx">  *
</span><del>- * Will remove trailing slash if it exists already before adding a trailing
- * slash. This prevents double slashing a string or path.
</del><ins>+ * Will remove trailing forward and backslashes if it exists already before adding
+ * a trailing forward slash. This prevents double slashing a string or path.
</ins><span class="cx">  *
</span><span class="cx">  * The primary use of this is for paths and thus should be used for paths. It is
</span><span class="cx">  * not restricted to paths and offers no specific path support.
</span><span class="cx">  *
</span><span class="cx">  * @since 1.2.0
</span><del>- * @uses untrailingslashit() Unslashes string if it was slashed already.
</del><span class="cx">  *
</span><span class="cx">  * @param string $string What to add the trailing slash to.
</span><span class="cx">  * @return string String with trailing slash added.
</span><span class="cx">  */
</span><del>-function trailingslashit($string) {
-       return untrailingslashit($string) . '/';
</del><ins>+function trailingslashit( $string ) {
+       return untrailingslashit( $string ) . '/';
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span><del>- * Removes trailing slash if it exists.
</del><ins>+ * Removes trailing forward slashes and backslashes if they exist.
</ins><span class="cx">  *
</span><span class="cx">  * The primary use of this is for paths and thus should be used for paths. It is
</span><span class="cx">  * not restricted to paths and offers no specific path support.
</span><span class="cx">  *
</span><span class="cx">  * @since 2.2.0
</span><span class="cx">  *
</span><del>- * @param string $string What to remove the trailing slash from.
- * @return string String without the trailing slash.
</del><ins>+ * @param string $string What to remove the trailing slashes from.
+ * @return string String without the trailing slashes.
</ins><span class="cx">  */
</span><del>-function untrailingslashit($string) {
-       return rtrim($string, '/');
</del><ins>+function untrailingslashit( $string ) {
+       return rtrim( $string, '/\\' );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/functions.php (27343 => 27344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/functions.php      2014-03-01 21:33:36 UTC (rev 27343)
+++ trunk/src/wp-includes/functions.php 2014-03-01 21:44:43 UTC (rev 27344)
</span><span class="lines">@@ -1455,17 +1455,17 @@
</span><span class="cx">          return trailingslashit(WP_TEMP_DIR);
</span><span class="cx"> 
</span><span class="cx">  if ( $temp )
</span><del>-               return trailingslashit( rtrim( $temp, '\\' ) );
</del><ins>+                return trailingslashit( $temp );
</ins><span class="cx"> 
</span><span class="cx">  if ( function_exists('sys_get_temp_dir') ) {
</span><span class="cx">          $temp = sys_get_temp_dir();
</span><span class="cx">          if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
</span><del>-                       return trailingslashit( rtrim( $temp, '\\' ) );
</del><ins>+                        return trailingslashit( $temp );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  $temp = ini_get('upload_tmp_dir');
</span><span class="cx">  if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
</span><del>-               return trailingslashit( rtrim( $temp, '\\' ) );
</del><ins>+                return trailingslashit( $temp );
</ins><span class="cx"> 
</span><span class="cx">  $temp = WP_CONTENT_DIR . '/';
</span><span class="cx">  if ( is_dir( $temp ) && wp_is_writable( $temp ) )
</span></span></pre></div>
<a id="trunktestsphpunittestsformattingSlashitphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/phpunit/tests/formatting/Slashit.php (27343 => 27344)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/phpunit/tests/formatting/Slashit.php 2014-03-01 21:33:36 UTC (rev 27343)
+++ trunk/tests/phpunit/tests/formatting/Slashit.php    2014-03-01 21:44:43 UTC (rev 27344)
</span><span class="lines">@@ -21,6 +21,22 @@
</span><span class="cx">          $this->assertEquals("a", untrailingslashit("a////"));
</span><span class="cx">  }
</span><span class="cx"> 
</span><ins>+       /**
+        * @ticket 22267
+        */
+       function test_removes_trailing_backslashes() {
+               $this->assertEquals("a", untrailingslashit("a\\"));
+               $this->assertEquals("a", untrailingslashit("a\\\\\\\\"));
+       }
+
+       /**
+        * @ticket 22267
+        */
+       function test_removes_trailing_mixed_slashes() {
+               $this->assertEquals("a", untrailingslashit("a/\\"));
+               $this->assertEquals("a", untrailingslashit("a\\/\\///\\\\//"));
+       }
+
</ins><span class="cx">   function test_adds_trailing_slash() {
</span><span class="cx">          $this->assertEquals("a/", trailingslashit("a"));
</span><span class="cx">  }
</span><span class="lines">@@ -28,4 +44,11 @@
</span><span class="cx">  function test_does_not_add_trailing_slash_if_one_exists() {
</span><span class="cx">          $this->assertEquals("a/", trailingslashit("a/"));
</span><span class="cx">  }
</span><ins>+
+       /**
+        * @ticket 22267
+        */
+       function test_converts_trailing_backslash_to_slash_if_one_exists() {
+               $this->assertEquals("a/", trailingslashit("a\\"));
+       }
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>