Merge commit 'refs/merge-requests/165' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / lib / subs.php

diff --git a/lib/subs.php b/lib/subs.php
index e2ce0667eb19f78e3c2e9f5aed9fb0fdcc76df47..165bbaa8ff7a4bbdc09429f3b703e55d6407846d 100644 (file)
--- a/lib/subs.php
+++ b/lib/subs.php
@@ -43,46 +43,3 @@ function subs_unsubscribe_to($user, $other)
         return $e->getMessage();
     }
 }
-
-function subs_unsubscribe_from($user, $other){
-   $local = User::staticGet("nickname",$other);
-   if($local){
-     return subs_unsubscribe_to($local,$user);
-   } else {
-    try {
-        $remote = Profile::staticGet("nickname",$other);
-        if(is_string($remote)){
-          return $remote;
-        }
-        if (Event::handle('StartUnsubscribe', array($remote,$user))) {
-
-            $sub = DB_DataObject::factory('subscription');
-
-            $sub->subscriber = $remote->id;
-            $sub->subscribed = $user->id;
-
-            $sub->find(true);
-
-            // note we checked for existence above
-
-            if (!$sub->delete())
-              return _('Couldn\'t delete subscription.');
-
-            $cache = common_memcache();
-
-            if ($cache) {
-                $cache->delete(common_cache_key('user:notices_with_friends:' . $remote->id));
-            }
-
-
-            $user->blowSubscribersCount();
-            $remote->blowSubscribersCount();
-
-            Event::handle('EndUnsubscribe', array($remote, $user));
-        }
-    } catch (Exception $e) {
-        return $e->getMessage();
-    }
-   }
-}
-