summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-02 15:26:27 -0500
committerSarven Capadisli <csarven@status.net>2010-03-02 15:26:27 -0500
commite9c127ddd869f44eafe7ae6b30d9dc69df8b863c (patch)
treea5847af8504385223110b579c9dab702cd766afa /lib/util.php
parent4113f28851020509163a31ab20658429d86c3134 (diff)
parent72460091ddc6763cb8d62f9d865390ea4973dd44 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php2
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);
}