summaryrefslogtreecommitdiff
path: root/lib/util.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-02-10 11:09:03 +0000
committerSarven Capadisli <csarven@status.net>2010-02-10 11:09:03 +0000
commit3d0bc1a3dd16826bf89286f37aa3778e93a34b6b (patch)
tree917cbd6dde0d9b47497def39e9dcf12e5433e544 /lib/util.php
parentf3c2dfacf4b3b1ce44edcb82d8e76e75e2b7c9fa (diff)
parente8428d1d525677fa116236735a43e7b49e8a3fd3 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'lib/util.php')
-rw-r--r--lib/util.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/util.php b/lib/util.php
index 9e8ac26ad..879834a3d 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -658,6 +658,9 @@ function common_valid_profile_tag($str)
function common_at_link($sender_id, $nickname)
{
$sender = Profile::staticGet($sender_id);
+ if (!$sender) {
+ return $nickname;
+ }
$recipient = common_relative_profile($sender, common_canonical_nickname($nickname));
if ($recipient) {
$user = User::staticGet('id', $recipient->id);