Strip backslashes, not just forward slashes, from untrailingslashit().

nacin · nacin · commit 8a617607a713 · 2014-03-01T21:44:43.000Z
trailingslashit() will now remove any forward or backslashes from the end of a string before appending a forward slash. props knutsp, willmot. fixes #22267. git-svn-id: https://develop.svn.wordpress.org/trunk@27344 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/formatting.php b/src/wp-includes/formatting.php
@@ -1482,35 +1482,34 @@ function backslashit($string) {
 /**
  * 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
  * not restricted to paths and offers no specific path support.
  *
  * @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) . '/';
+function trailingslashit( $string ) {
+	return untrailingslashit( $string ) . '/';
 }
 
 /**
- * Removes trailing slash if it exists.
+ * 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
  * 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 slashes from.
+ * @return string String without the trailing slashes.
  */
-function untrailingslashit($string) {
-	return rtrim($string, '/');
+function untrailingslashit( $string ) {
+	return rtrim( $string, '/\\' );
 }
 
 /**
diff --git a/src/wp-includes/functions.php b/src/wp-includes/functions.php
@@ -1455,17 +1455,17 @@ function get_temp_dir() {
 		return trailingslashit(WP_TEMP_DIR);
 
 	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 . '/';
 	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
diff --git a/tests/phpunit/tests/formatting/Slashit.php b/tests/phpunit/tests/formatting/Slashit.php
@@ -21,11 +21,34 @@ function test_removes_trailing_slashes() {
 		$this->assertEquals("a", untrailingslashit("a////"));
 	}
 
+	/**
+	 * @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"));
 	}
 
 	function test_does_not_add_trailing_slash_if_one_exists() {
 		$this->assertEquals("a/", trailingslashit("a/"));
 	}
+
+	/**
+	 * @ticket 22267
+	 */
+	function test_converts_trailing_backslash_to_slash_if_one_exists() {
+		$this->assertEquals("a/", trailingslashit("a\\"));
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -1482,35 +1482,34 @@ function backslashit($string) {`
`1482`	`1482`	`/**`
`1483`	`1483`	`* Appends a trailing slash.`
`1484`	`1484`	`*`
`1485`		`- * Will remove trailing slash if it exists already before adding a trailing`
`1486`		`- * slash. This prevents double slashing a string or path.`
	`1485`	`+ * Will remove trailing forward and backslashes if it exists already before adding`
	`1486`	`+ * a trailing forward slash. This prevents double slashing a string or path.`
`1487`	`1487`	`*`
`1488`	`1488`	`* The primary use of this is for paths and thus should be used for paths. It is`
`1489`	`1489`	`* not restricted to paths and offers no specific path support.`
`1490`	`1490`	`*`
`1491`	`1491`	`* @since 1.2.0`
`1492`		`- * @uses untrailingslashit() Unslashes string if it was slashed already.`
`1493`	`1492`	`*`
`1494`	`1493`	`* @param string $string What to add the trailing slash to.`
`1495`	`1494`	`* @return string String with trailing slash added.`
`1496`	`1495`	`*/`
`1497`		`-function trailingslashit($string) {`
`1498`		`- return untrailingslashit($string) . '/';`
	`1496`	`+function trailingslashit( $string ) {`
	`1497`	`+ return untrailingslashit( $string ) . '/';`
`1499`	`1498`	`}`
`1500`	`1499`
`1501`	`1500`	`/**`
`1502`		`- * Removes trailing slash if it exists.`
	`1501`	`+ * Removes trailing forward slashes and backslashes if they exist.`
`1503`	`1502`	`*`
`1504`	`1503`	`* The primary use of this is for paths and thus should be used for paths. It is`
`1505`	`1504`	`* not restricted to paths and offers no specific path support.`
`1506`	`1505`	`*`
`1507`	`1506`	`* @since 2.2.0`
`1508`	`1507`	`*`
`1509`		`- * @param string $string What to remove the trailing slash from.`
`1510`		`- * @return string String without the trailing slash.`
	`1508`	`+ * @param string $string What to remove the trailing slashes from.`
	`1509`	`+ * @return string String without the trailing slashes.`
`1511`	`1510`	`*/`
`1512`		`-function untrailingslashit($string) {`
`1513`		`- return rtrim($string, '/');`
	`1511`	`+function untrailingslashit( $string ) {`
	`1512`	`+ return rtrim( $string, '/\\' );`
`1514`	`1513`	`}`
`1515`	`1514`
`1516`	`1515`	`/**`