Merge branch 'ATOM-priority" from Alexandre Alapetite into HEAD

[quix0rs-gnu-social.git] / plugins / Poll / actions / newpoll.php

diff --git a/plugins/Poll/actions/newpoll.php b/plugins/Poll/actions/newpoll.php
index 071778aaa2109486618b515a3ce8d4b091a20a47..045b895e294589fa9d541057e02a5fafdef895a3 100644 (file)
--- a/plugins/Poll/actions/newpoll.php
+++ b/plugins/Poll/actions/newpoll.php
@@ -66,13 +66,14 @@ class NewPollAction extends Action
     /**
      * For initializing members of the class.
      *
-     * @param array $argarray misc. arguments
+     * @param array $args misc. arguments
      *
      * @return boolean true
+     * @throws ClientException
      */
-    function prepare($argarray)
+    function prepare(array $args = [])
     {
-        parent::prepare($argarray);
+        parent::prepare($args);
 
         $this->user = common_current_user();
 
@@ -100,13 +101,11 @@ class NewPollAction extends Action
     /**
      * Handler method
      *
-     * @param array $argarray is ignored since it's now passed in in prepare()
-     *
      * @return void
      */
-    function handle($argarray=null)
+    function handle()
     {
-        parent::handle($argarray);
+        parent::handle();
 
         if ($this->isPost()) {
             $this->newPoll();
@@ -125,7 +124,7 @@ class NewPollAction extends Action
     function newPoll()
     {
         if ($this->boolean('ajax')) {
-            StatusNet::setApi(true);
+            GNUsocial::setApi(true);
         }
         try {
             if (empty($this->question)) {