summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2009-10-20 06:06:10 +0000
committerZach Copley <zach@status.net>2009-10-20 06:06:10 +0000
commit09dfb08a3984b22217849b9ab73898d0687f6649 (patch)
tree666769ef0824f538eca6d6284632e27c44c50ff3 /scripts
parent7539e26951ba9e1529d9a24a7a634861b7d080fe (diff)
parent19b870c439120c8d9dcdac37cd161ed00d070ba7 (diff)
Merge branch '0.9.x' into TwitterBridgePlugin
Diffstat (limited to 'scripts')
-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))