From: Evan Prodromou <evan@status.net>
Date: Mon, 19 Oct 2009 22:12:00 +0000 (-0400)
Subject: merge from testing
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=fc61b7162576deb11a7947a8a04293b744f9d5fc;p=quix0rs-gnu-social.git

merge from testing
---

fc61b7162576deb11a7947a8a04293b744f9d5fc
diff --cc lib/util.php
index e9ae2bd50e,047faeef0d..e641afd4db
--- a/lib/util.php
+++ b/lib/util.php
@@@ -401,10 -391,10 +401,10 @@@ function common_render_content($text, $
  {
      $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);
 +    $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);
      return $r;
  }