From 5cde784419c77fe808e03b47007ef8f12fa83049 Mon Sep 17 00:00:00 2001 From: Jonathan Stanley Date: Fri, 13 Apr 2007 15:33:22 +0000 Subject: Revert and undoing bug #9736 Won't fix, at least for 3.0.x. Re-review come 3.2.x and perhaps may be able to get localised prefixes, so something like: Sv: Re: Antwort: ... doesn't happen. :P git-svn-id: file:///svn/phpbb/trunk@7354 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 61aba60146..d20002dd96 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3295,13 +3295,11 @@ function get_preg_expression($mode) */ function truncate_string($string, $max_length = 60, $allow_reply = true, $append = '') { - global $user; - $chars = array(); $strip_reply = false; $stripped = false; - if ($allow_reply && strpos($string, $user->lang['SUBJECT_CONCERNING_PREFIX']) === 0) + if ($allow_reply && strpos($string, 'Re: ') === 0) { $strip_reply = true; $string = substr($string, 4); @@ -3320,7 +3318,7 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append if ($strip_reply) { - $string = $user->lang['SUBJECT_CONCERNING_PREFIX'] . $string; + $string = 'Re: ' . $string; } if ($append != '' && $stripped) -- cgit v1.2.1