diff options
| author | Jonathan Stanley <shs@users.sourceforge.net> | 2007-04-13 15:33:22 +0000 |
|---|---|---|
| committer | Jonathan Stanley <shs@users.sourceforge.net> | 2007-04-13 15:33:22 +0000 |
| commit | 5cde784419c77fe808e03b47007ef8f12fa83049 (patch) | |
| tree | a32717e90ef1f77b4d0f3a26a0799f4a72e53a34 /phpBB/includes | |
| parent | 59c4fad29693584f44fe3acf4de12291c4d8f170 (diff) | |
| download | forums-5cde784419c77fe808e03b47007ef8f12fa83049.tar forums-5cde784419c77fe808e03b47007ef8f12fa83049.tar.gz forums-5cde784419c77fe808e03b47007ef8f12fa83049.tar.bz2 forums-5cde784419c77fe808e03b47007ef8f12fa83049.tar.xz forums-5cde784419c77fe808e03b47007ef8f12fa83049.zip | |
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
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 6 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 |
2 files changed, 3 insertions, 5 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) |