From 9331f3efea8cf892838d346ba26692fe79ba854e Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Sat, 10 Mar 2007 08:32:57 +0000
Subject: [PATCH] Improvements to untrailingslashit() and trailingslashit(). 
 props Jamie Talbot.  fixes #3899

git-svn-id: https://develop.svn.wordpress.org/trunk@5021 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/formatting.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index d76425b688..b10d53c32f 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -563,13 +563,11 @@ function backslashit($string) {
 }
 
 function trailingslashit($string) {
-		if ( '/' != substr($string, -1))
-				$string .= '/';
-		return $string;
+	return untrailingslashit($string) . '/';
 }
 
 function untrailingslashit($string) {
-	return preg_replace('|/+$|', '', $string);
+	return rtrim($string, '/');
 }
 
 function addslashes_gpc($gpc) {