Ticket #22267: 22267.d.diff

src/wp-includes/formatting.php

@@ -1482 +1482 @@
 /**
  * Appends a trailing slash.
  *
- * Will remove trailing slash if it exists already before adding a trailing
+ * Will remove trailing slash or backslash if it exists already before adding a trailing
  * slash. This prevents double slashing a string or path.
  *
  * The primary use of this is for paths and thus should be used for paths. It is
  * not restricted to paths and offers no specific path support.
  *
  * @since 1.2.0
- * @uses untrailingslashit() Unslashes string if it was slashed already.
+ * @uses untrailingslashit() Removes trailing slash or backslash if it exists.
  *
  * @param string $string What to add the trailing slash to.
  * @return string String with trailing slash added.
  */
-function trailingslashit($string) {
-        return untrailingslashit($string) . '/';
+function trailingslashit( $string ) {
+        return untrailingslashit( $string ) . '/';
 }
 
 /**
- * Removes trailing slash if it exists.
+ * Removes trailing slash or backslash if it exists.
  *
  * The primary use of this is for paths and thus should be used for paths. It is
  * not restricted to paths and offers no specific path support.
  *
  * @since 2.2.0
  *
- * @param string $string What to remove the trailing slash from.
- * @return string String without the trailing slash.
+ * @param string $string What to remove the trailing slash or backslash from.
+ * @return string String without the trailing slash or backslash.
  */
-function untrailingslashit($string) {
-        return rtrim($string, '/');
+function untrailingslashit( $string ) {
+        return rtrim( $string, '/\\' );
 }
 
 /**

tests/phpunit/tests/formatting/Slashit.php

@@ -21 +21 @@
                 $this->assertEquals("a", untrailingslashit("a////"));
         }
 
+        function test_removes_trailing_backslashes() {
+                $this->assertEquals("a", untrailingslashit("a\\"));
+                $this->assertEquals("a", untrailingslashit("a\\\\\\\\"));
+        }
+
         function test_adds_trailing_slash() {
                 $this->assertEquals("a/", trailingslashit("a"));
         }
@@ -28 +33 @@
         function test_does_not_add_trailing_slash_if_one_exists() {
                 $this->assertEquals("a/", trailingslashit("a/"));
         }
+
+        function test_converts_trailing_backslash_to_slash_if_one_exists() {
+                $this->assertEquals("a/", trailingslashit("a\\"));
+        }
 }