diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-02 12:21:48 -0800 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-02 12:21:48 -0800 |
commit | 72460091ddc6763cb8d62f9d865390ea4973dd44 (patch) | |
tree | 78c13bbd3cc8774ad1bee1c92bfe0982744f8c89 /lib/util.php | |
parent | e3c2b8e0b50d750ad35cb313726fd2706684c09b (diff) | |
parent | b1ffbf17d3da90f4c509a47c9fd876304ed9e3fc (diff) |
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/util.php')
-rw-r--r-- | lib/util.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/util.php b/lib/util.php index 7a170a5f5..439db581a 100644 --- 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); } |