Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

2010-03-02 13:38:10 -08:00
parent 8629664ed9 e9c127ddd8
commit ddf3614c84
50 changed files with 1172 additions and 270 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -550,7 +550,7 @@ function common_find_mentions($text, $notice)
            } else if (!empty($originalMentions) &&
                       array_key_exists($nickname, $originalMentions)) {

-                $mention = $originalMentions[$nickname];
+                $mentioned = $originalMentions[$nickname];
            } else {
                $mentioned = common_relative_profile($sender, $nickname);
            }