diff options
| author | Zach Copley <zach@status.net> | 2009-10-20 00:53:08 +0000 |
|---|---|---|
| committer | Zach Copley <zach@status.net> | 2009-10-20 00:53:08 +0000 |
| commit | 19b870c439120c8d9dcdac37cd161ed00d070ba7 (patch) | |
| tree | 415fcca4597685cf2d953d6cb56e226b157f3421 /scripts | |
| parent | 9cdd77625e25e7c506121d42b28c1ec870c2d4e4 (diff) | |
| parent | f7a3b30f5b8d42fca0fb8e2f0eb661601a282763 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/maildaemon.php | 4 |
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)) |