summaryrefslogtreecommitdiff
path: root/classes/Notice.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 /classes/Notice.php
parentf3c2dfacf4b3b1ce44edcb82d8e76e75e2b7c9fa (diff)
parente8428d1d525677fa116236735a43e7b49e8a3fd3 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'classes/Notice.php')
-rw-r--r--classes/Notice.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/classes/Notice.php b/classes/Notice.php
index f9f386357..fca1c599c 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -1176,6 +1176,10 @@ class Notice extends Memcached_DataObject
// Figure out who that is.
$sender = Profile::staticGet('id', $profile_id);
+ if (empty($sender)) {
+ return null;
+ }
+
$recipient = common_relative_profile($sender, $nickname, common_sql_now());
if (empty($recipient)) {