Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index bec05f8cfcf5866ee72111bdda7457035a84c31d..4626a7ca1ece5e12eeea98b599d03df08a5acef9 100644 (file)
--- 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');