summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-28 15:49:14 -0800
committerEvan Prodromou <evan@status.net>2009-12-28 15:49:14 -0800
commit98a579fedf36ff795e255a4b345651df0ee230bc (patch)
tree2eba012e0094cced9580523051b8ed88b6aefd6b /classes/User.php
parent5f6df8c0c4274e7d900335bba87341f9768e7467 (diff)
parentfa3301cf84ee0a78c4e00c7bd309de8a769fd848 (diff)
Merge branch 'master' into 0.9.x
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php
index 484dc8c82..6708d95b6 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -625,7 +625,11 @@ class User extends Memcached_DataObject
// Cancel their subscription, if it exists
- subs_unsubscribe_to($other->getUser(),$this->getProfile());
+ $otherUser = User::staticGet('id', $other->id);
+
+ if (!empty($otherUser)) {
+ subs_unsubscribe_to($otherUser, $this->getProfile());
+ }
$block->query('COMMIT');