Changeset 27344

Timestamp:

03/01/2014 09:44:43 PM (11 years ago)

Author:

nacin

Message:

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 #22267.

Location:

trunk

Files:

• src/wp-includes/formatting.php (modified) (3 diffs)
• src/wp-includes/functions.php (modified) (1 diff)
• tests/phpunit/tests/formatting/Slashit.php (modified) (2 diffs)

trunk/src/wp-includes/formatting.php

@@ -1483 +1483 @@
  * Appends a trailing slash.
  *
- * Will remove trailing slash if it exists already before adding a trailing
- * slash. This prevents double slashing a string or path.
+ * Will remove trailing forward and backslashes if it exists already before adding
+ * a trailing forward 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
@@ -1490 +1490 @@
  *
  * @since 1.2.0
- * @uses untrailingslashit() Unslashes string if it was slashed already.
  *
  * @param string $string What to add the trailing slash to.
  * @return string String with trailing slash added.
  */
-function trailingslashit($string) {
-    return untrailingslashit($string) . '/';
-}
-
-/**
- * Removes trailing slash if it exists.
+function trailingslashit( $string ) {
+    return untrailingslashit( $string ) . '/';
+}
+
+/**
+ * Removes trailing forward slashes and backslashes if they exist.
  *
  * The primary use of this is for paths and thus should be used for paths. It is
@@ -1507 +1506 @@
  * @since 2.2.0
  *
- * @param string $string What to remove the trailing slash from.
- * @return string String without the trailing slash.
- */
-function untrailingslashit($string) {
-    return rtrim($string, '/');
+ * @param string $string What to remove the trailing slashes from.
+ * @return string String without the trailing slashes.
+ */
+function untrailingslashit( $string ) {
+    return rtrim( $string, '/\\' );
 }
 

trunk/src/wp-includes/functions.php

@@ -1456 +1456 @@
 
     if ( $temp )
-        return trailingslashit( rtrim( $temp, '\\' ) );
+        return trailingslashit( $temp );
 
     if ( function_exists('sys_get_temp_dir') ) {
         $temp = sys_get_temp_dir();
         if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-            return trailingslashit( rtrim( $temp, '\\' ) );
+            return trailingslashit( $temp );
     }
 
     $temp = ini_get('upload_tmp_dir');
     if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-        return trailingslashit( rtrim( $temp, '\\' ) );
+        return trailingslashit( $temp );
 
     $temp = WP_CONTENT_DIR . '/';

trunk/tests/phpunit/tests/formatting/Slashit.php

@@ -22 +22 @@
     }
 
+    /**
+     * @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\\/\\///\\\\//"));
+    }
+
     function test_adds_trailing_slash() {
         $this->assertEquals("a/", trailingslashit("a"));
@@ -29 +45 @@
         $this->assertEquals("a/", trailingslashit("a/"));
     }
+
+    /**
+     * @ticket 22267
+     */
+    function test_converts_trailing_backslash_to_slash_if_one_exists() {
+        $this->assertEquals("a/", trailingslashit("a\\"));
+    }
 }