Merge remote-tracking branch 'upstream/master'

[quix0rs-gnu-social.git] / plugins / Event / actions / newrsvp.php

diff --git a/plugins/Event/actions/newrsvp.php b/plugins/Event/actions/newrsvp.php
index cbe67ae1733cac3456e21e6db6f6896b7e03df4f..ea32b2b368e179a9c3f6121367f931d4a122dc1d 100644 (file)
--- a/plugins/Event/actions/newrsvp.php
+++ b/plugins/Event/actions/newrsvp.php
@@ -72,7 +72,7 @@ class NewrsvpAction extends Action
     {
         parent::prepare($argarray);
         if ($this->boolean('ajax')) {
-            StatusNet::setApi(true); // short error results!
+            GNUsocial::setApi(true); // short error results!
         }
 
         $eventId = $this->trimmed('event');
@@ -166,7 +166,7 @@ class NewrsvpAction extends Action
             $this->elementEnd('body');
             $this->endHTML();
         } else {
-            common_redirect($saved->bestUrl(), 303);
+            common_redirect($saved->getUrl(), 303);
         }
     }
 
@@ -197,7 +197,7 @@ class NewrsvpAction extends Action
      *
      * @return boolean is read only action?
      */
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         if ($_SERVER['REQUEST_METHOD'] == 'GET' ||
             $_SERVER['REQUEST_METHOD'] == 'HEAD') {