From 5cde784419c77fe808e03b47007ef8f12fa83049 Mon Sep 17 00:00:00 2001
From: Jonathan Stanley <shs@users.sourceforge.net>
Date: Fri, 13 Apr 2007 15:33:22 +0000
Subject: [PATCH] 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: <Subject>

... doesn't happen. :P


git-svn-id: file:///svn/phpbb/trunk@7354 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/functions.php          | 6 ++----
 phpBB/includes/ucp/ucp_pm_compose.php | 2 +-
 phpBB/language/en/common.php          | 1 -
 phpBB/posting.php                     | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

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)
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php
index ef37a59bff..6c9bfdbdb3 100644
--- a/phpBB/includes/ucp/ucp_pm_compose.php
+++ b/phpBB/includes/ucp/ucp_pm_compose.php
@@ -674,7 +674,7 @@ function compose_pm($id, $mode, $action)
 
 	if (($action == 'reply' || $action == 'quote' || $action == 'quotepost') && !$preview && !$refresh)
 	{
-		$message_subject = ((strpos($message_subject, $user->lang['SUBJECT_CONCERNING_PREFIX']) !== 0) ? $user->lang['SUBJECT_CONCERNING_PREFIX'] : '') . censor_text($message_subject);
+		$message_subject = ((!preg_match('/^Re:/', $message_subject)) ? 'Re: ' : '') . censor_text($message_subject);
 	}
 
 	if ($action == 'forward' && !$preview && !$refresh && !$submit)
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index e34aae5eec..97248cba0c 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -504,7 +504,6 @@ $lang = array_merge($lang, array(
 	'SUBFORUM'					=> 'Subforum',
 	'SUBFORUMS'					=> 'Subforums',
 	'SUBJECT'					=> 'Subject',
-	'SUBJECT_CONCERNING_PREFIX'	=> 'Re: ', // This is Latin or "concerning" or "about", most Latin influenced languages  (id est: those with Latin script) can use this "as is". Localise phrase and punctuation if required.
 	'SUBMIT'					=> 'Submit',
 
 	'TERMS_USE'			=> 'Terms of use',
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 3441e91076..d1b6946d6d 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1063,7 +1063,7 @@ if ($mode == 'quote' && !$submit && !$preview && !$refresh)
 
 if (($mode == 'reply' || $mode == 'quote') && !$submit && !$preview && !$refresh)
 {
-	$post_data['post_subject'] = ((strpos($post_data['post_subject'], $user->lang['SUBJECT_CONCERNING_PREFIX']) !== 0) ? $user->lang['SUBJECT_CONCERNING_PREFIX'] : '') . censor_text($post_data['post_subject']);
+	$post_data['post_subject'] = ((strpos($post_data['post_subject'], 'Re: ') !== 0) ? 'Re: ' : '') . censor_text($post_data['post_subject']);
 }
 
 $attachment_data = $message_parser->attachment_data;