Tidying up getUser calls to profiles and some events

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

diff --git a/classes/User.php b/classes/User.php
index 55057574dbbe617fcd3062a5bb03e1fd682be174..e8e06a2d40b9d00f17f512bb980343dbad2e0d38 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -225,14 +225,6 @@ class User extends Managed_DataObject
         return Sms_carrier::getKV('id', $this->carrier);
     }
 
-    /**
-     * @deprecated use Subscription::start($sub, $other);
-     */
-    function subscribeTo($other)
-    {
-        return Subscription::start($this->getProfile(), $other);
-    }
-
     function hasBlocked($other)
     {
         $profile = $this->getProfile();
@@ -437,7 +429,7 @@ class User extends Managed_DataObject
                     common_log(LOG_WARNING, sprintf("Default user %s does not exist.", $defnick),
                                __FILE__);
                 } else {
-                    Subscription::start($user, $defuser);
+                    Subscription::start($profile, $defuser->getProfile());
                 }
             }
 
@@ -594,7 +586,7 @@ class User extends Managed_DataObject
         return Profile_tag::setTags($this->id, $this->id, $newtags, $privacy);
     }
 
-    function block($other)
+    function block(Profile $other)
     {
         // Add a new block record