summaryrefslogtreecommitdiff
path: root/classes/Notice.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-08 15:48:52 -0800
committerBrion Vibber <brion@pobox.com>2010-02-08 15:48:52 -0800
commitb2e8d8407cc7f1abb5e8767cd3403ac356775eaa (patch)
tree5cfaed5f1f21a697e147b41695c7e8c5282324a3 /classes/Notice.php
parent3833dc8c1f3f9ba5e3b12bf2715e4a4fb3adabf1 (diff)
parent4e6f587f868d71f08c618d0dedf6ddf0331619c2 (diff)
Merge branch 'testing' 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)) {