Merged

[quix0rs-gnu-social.git] / actions / subscribe.php

diff --git a/actions/subscribe.php b/actions/subscribe.php
index 4002c9fbb0164267250333f87255f782489616b1..1da061819baf835b90d10610127e780fad3ca2a2 100644 (file)
--- a/actions/subscribe.php
+++ b/actions/subscribe.php
@@ -64,7 +64,7 @@ class SubscribeAction extends Action
      *
      * @return boolean success flag
      */
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -118,11 +118,11 @@ class SubscribeAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         // Throws exception on error
 
-        $sub = Subscription::start($this->user->getProfile(),
+        $sub = Subscription::ensureStart($this->user->getProfile(),
                                    $this->other);
 
         if ($this->boolean('ajax')) {