summaryrefslogtreecommitdiff
path: root/roundcubemail/program/steps/mail/compose.inc
diff options
context:
space:
mode:
authorroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2005-10-13 21:53:33 +0000
committerroundcube <roundcube@208e9e7b-5314-0410-a742-e7e81cd9613c>2005-10-13 21:53:33 +0000
commitb0c39e4f356472a741a1c092a46c494615d2a25f (patch)
treea4d8ddef84f53319cfd5fc7b8bc15aafc27c743c /roundcubemail/program/steps/mail/compose.inc
parentda2e18f380734999ec1d1ba57091850bf296f554 (diff)
Some error messages added
git-svn-id: https://svn.roundcube.net/trunk@26 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/steps/mail/compose.inc')
-rw-r--r--roundcubemail/program/steps/mail/compose.inc9
1 files changed, 7 insertions, 2 deletions
diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index f65e4ff7b..52b64d804 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -404,7 +404,7 @@ function rcmail_compose_subject($attrib)
// create a reply-subject
else if (isset($REPLY_MESSAGE['subject']))
{
- if (strpos($REPLY_MESSAGE['subject'], 'Re:')===0)
+ if (eregi('^re:', $REPLY_MESSAGE['subject']))
$subject = $REPLY_MESSAGE['subject'];
else
$subject = 'Re: '.$REPLY_MESSAGE['subject'];
@@ -412,7 +412,12 @@ function rcmail_compose_subject($attrib)
// create a forward-subject
else if (isset($FORWARD_MESSAGE['subject']))
- $subject = 'Fwd: '.$FORWARD_MESSAGE['subject'];
+ {
+ if (eregi('^fwd:', $REPLY_MESSAGE['subject']))
+ $subject = $FORWARD_MESSAGE['subject'];
+ else
+ $subject = 'Fwd: '.$FORWARD_MESSAGE['subject'];
+ }
$out = $form_start ? "$form_start\n" : '';