mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Revert and undoing bug #9736

Browse Source 
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
This commit is contained in:
Jonathan Stanley
2007-04-13 15:33:22 +00:00
parent 59c4fad296
commit 5cde784419
4 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions.php
View File

@@ -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)

2
phpBB/includes/ucp/ucp_pm_compose.php
View File

@@ -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)