summaryrefslogtreecommitdiff
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
parent035d4cf86e8cd2bec46a9b24e098c798f3ec3cb3 (diff)
parentd72748eb8e71f81e7cddca610ec98a8910dd347f (diff)
merge from testing
-rw-r--r--README2
-rw-r--r--lib/util.php2
-rwxr-xr-xscripts/maildaemon.php4
3 files changed, 6 insertions, 2 deletions
diff --git a/README b/README
index 037027d43..a8b83fc17 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@
README
------
-StatusNet 0.8.1 ("Second Guessing")
+StatusNet 0.8.2 ("Life and How to Live It")
26 Aug 2009
This is the README file for StatusNet (formerly Laconica), the Open
diff --git a/lib/util.php b/lib/util.php
index e9ae2bd50..e641afd4d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -401,7 +401,7 @@ function common_render_content($text, $notice)
{
$r = common_render_text($text);
$id = $notice->profile_id;
- $r = preg_replace('/(^|[\s\.\,\:\;]+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
+ $r = preg_replace('/(^|\s+)@(['.NICKNAME_FMT.']{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
$r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
$r = preg_replace('/(^|[\s\.\,\:\;]+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
$r = preg_replace('/(^|[\s\.\,\:\;]+)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
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))