diff options
| author | Evan Prodromou <evan@status.net> | 2010-04-26 02:43:33 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-04-26 02:43:33 -0400 |
| commit | 5c05cd2b1a93d360bde7cb7dfc9ba39e5a5a7624 (patch) | |
| tree | 5b4092e365023c7729fcdd8260431d3ffb28b519 /classes/User.php | |
| parent | 14adb7cc41e3d5d4e543c1f13f7a60d3cadb5c71 (diff) | |
| parent | d7d3a50d8751f071aa95541813af1d190e71430e (diff) | |
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
Diffstat (limited to 'classes/User.php')
| -rw-r--r-- | classes/User.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php index bec05f8cf..4626a7ca1 100644 --- a/classes/User.php +++ b/classes/User.php @@ -543,7 +543,10 @@ class User extends Memcached_DataObject return false; } - Subscription::cancel($other, $this->getProfile()); + $self = $this->getProfile(); + if (Subscription::exists($other, $self)) { + Subscription::cancel($other, $self); + } $block->query('COMMIT'); |