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

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);