From d432737d8ed4f1a98a271e25e686c2085836e596 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 28 Oct 2010 01:33:41 +0000
Subject: [PATCH] - Patch #931520 by David_Rothstein: [site:url-brief] token
puts an unnecessary slash at the end.
---
modules/system/system.test | 2 +-
modules/system/system.tokens.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/system/system.test b/modules/system/system.test
index 511c9c28e63..85ac6160997 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -1578,7 +1578,7 @@ class TokenReplaceTestCase extends DrupalWebTestCase {
$tests['[site:slogan]'] = check_plain(variable_get('site_slogan', ''));
$tests['[site:mail]'] = 'simpletest@example.com';
$tests['[site:url]'] = url('<front>', $url_options);
- $tests['[site:url-brief]'] = preg_replace('!^https?://!', '', url('<front>', $url_options));
+ $tests['[site:url-brief]'] = preg_replace(array('!^https?://!', '!/$!'), '', url('<front>', $url_options));
$tests['[site:login-url]'] = url('user', $url_options);
// Test to make sure that we generated something for each token.
diff --git a/modules/system/system.tokens.inc b/modules/system/system.tokens.inc
index f57daf2da20..6ce9971b1cc 100644
--- a/modules/system/system.tokens.inc
+++ b/modules/system/system.tokens.inc
@@ -165,7 +165,7 @@ function system_tokens($type, $tokens, array $data = array(), array $options = a
break;
case 'url-brief':
- $replacements[$original] = preg_replace('!^https?://!', '', url('<front>', $url_options));
+ $replacements[$original] = preg_replace(array('!^https?://!', '!/$!'), '', url('<front>', $url_options));
break;
case 'login-url':