From 3673a2deb33a13b35bd05b8693da08f1b64fbc42 Mon Sep 17 00:00:00 2001 From: pdontthink Date: Tue, 16 Feb 2010 20:13:21 +0000 Subject: [PATCH] RFC 3676 says there can't be more in the signature delimiter line than this git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@13913 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- src/compose.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/compose.php b/src/compose.php index 605e12c8..5a30de5f 100644 --- a/src/compose.php +++ b/src/compose.php @@ -980,7 +980,7 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se $body = ''; $strip_sigs = getPref($data_dir, $username, 'strip_sigs'); foreach ($rewrap_body as $line) { - if ($strip_sigs && substr($line,0,3) == '-- ') { + if ($strip_sigs && rtrim($line, "\r\n") == '-- ') { break; } if (preg_match("/^(>+)/", $line, $matches)) { -- 2.25.1