summaryrefslogtreecommitdiff
path: root/scripts/maildaemon.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2009-10-27 15:00:35 +0100
committerSarven Capadisli <csarven@status.net>2009-10-27 15:00:35 +0100
commitac47015e2b9b4a82ef497d203fb971b7f128ad41 (patch)
treec9bb929b2062f4437bafea1830a8af08d877015f /scripts/maildaemon.php
parent0e029d728429009e7791ae052df4e9998e309fab (diff)
parent0b4390e7f2322a15f16919425de039d555b3e516 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
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))