summaryrefslogtreecommitdiff
path: root/scripts/maildaemon.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-10-19 18:12:00 -0400
committerEvan Prodromou <evan@status.net>2009-10-19 18:12:00 -0400
commitfc61b7162576deb11a7947a8a04293b744f9d5fc (patch)
treefe982d15fab61bc974b92bc8162ed9d9da041976 /scripts/maildaemon.php
parent035d4cf86e8cd2bec46a9b24e098c798f3ec3cb3 (diff)
parentd72748eb8e71f81e7cddca610ec98a8910dd347f (diff)
merge from testing
Diffstat (limited to 'scripts/maildaemon.php')
-rwxr-xr-xscripts/maildaemon.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/maildaemon.php b/scripts/maildaemon.php
index 586bef624..84dff8912 100755
--- a/scripts/maildaemon.php
+++ b/scripts/maildaemon.php
@@ -365,6 +365,10 @@ class MailerDaemon
if (preg_match('/^\s*Sent via/', $line)) {
continue;
}
+ if (preg_match('/^\s*Sent from my/', $line)) {
+ continue;
+ }
+
// skip everything after a sig
if (preg_match('/^\s*--+\s*$/', $line) ||
preg_match('/^\s*__+\s*$/', $line))