Merge branch 'nightly' into 'nightly'

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

diff --git a/actions/invite.php b/actions/invite.php
index f99dd4d783497a0cd76f8f170de7254362cd4e32..827e0266966de2d0025f52c7332fed93377496ec 100644 (file)
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -38,9 +38,9 @@ class InviteAction extends Action
         return false;
     }
 
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
         if (!common_config('invite', 'enabled')) {
             // TRANS: Client error displayed when trying to sent invites while they have been disabled.
             $this->clientError(_('Invites have been disabled.'));
@@ -118,7 +118,7 @@ class InviteAction extends Action
                         $this->already[] = $other;
                     } else {
                         try {
-                            Subscription::start($profile, $other);
+                            Subscription::ensureStart($profile, $other);
                             $this->subbed[] = $other;
                         } catch (Exception $e) {
                             // subscription failed, but keep working