Ticket #22267: 22267.c.patch

formatting.php

@@ -1362 +1362 @@
  * @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, '/' . chr( 92 ) );
 }
 
 /**