summaryrefslogtreecommitdiffstats
path: root/wp-includes/formatting.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-03-12 23:03:30 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-03-12 23:03:30 +0000
commit0d4bfdbf8c17706b57e92838d1599cb9e82c893b (patch)
treef02f84d4c598373d7e5921ea3d3e66fd50850d24 /wp-includes/formatting.php
parentbed8532fd2d9cc526a74f4fc4214887b37cf6e71 (diff)
downloadwordpress-mu-0d4bfdbf8c17706b57e92838d1599cb9e82c893b.tar.gz
wordpress-mu-0d4bfdbf8c17706b57e92838d1599cb9e82c893b.tar.xz
wordpress-mu-0d4bfdbf8c17706b57e92838d1599cb9e82c893b.zip
WP Merge to 5028
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@915 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/formatting.php')
-rw-r--r--wp-includes/formatting.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index 718a217..b10d53c 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -563,10 +563,11 @@ function backslashit($string) {
}
function trailingslashit($string) {
- if ( '/' != substr($string, -1)) {
- $string .= '/';
- }
- return $string;
+ return untrailingslashit($string) . '/';
+}
+
+function untrailingslashit($string) {
+ return rtrim($string, '/');
}
function addslashes_gpc($gpc) {