When handling incoming mail, skip everything after a blank line if we already have content

2010-05-03 23:02:25 -04:00 · 2010-05-03 23:02:25 -04:00 · 4fe00a3075
commit 4fe00a3075
parent f514f7b722
1 changed files with 4 additions and 0 deletions
--- 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;
        }