From 4fe00a3075c10c5b2168ac2b4996a32055a799ee Mon Sep 17 00:00:00 2001 From: Craig Andrews Date: Mon, 3 May 2010 23:02:25 -0400 Subject: When handling incoming mail, skip everything after a blank line if we already have content --- lib/mailhandler.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/mailhandler.php b/lib/mailhandler.php index 890f6d5b4..e9ba41839 100644 --- a/lib/mailhandler.php +++ b/lib/mailhandler.php @@ -265,6 +265,10 @@ class MailHandler if (preg_match('/^\s*Begin\s+forward/', $line)) { break; } + // skip everything after a blank line if we already have content + if ($output !== '' && $line === '') { + break; + } $output .= ' ' . $line; } -- cgit v1.2.3-54-g00ecf