Merge branch 'genericons-fix' into 'nightly'

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

diff --git a/actions/editapplication.php b/actions/editapplication.php
index 00ed3971935ed520bc132c470e832620894e1d06..d492afb08f692667aca02780ee160ce7b25cab0c 100644 (file)
--- a/actions/editapplication.php
+++ b/actions/editapplication.php
@@ -57,14 +57,13 @@ class EditApplicationAction extends Action
     /**
      * Prepare to run
      */
-    function prepare($args)
+    function prepare(array $args = array())
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
             // TRANS: Client error displayed trying to edit an application while not logged in.
             $this->clientError(_('You must be logged in to edit an application.'));
-            return false;
         }
 
         $id = (int)$this->arg('id');
@@ -81,7 +80,6 @@ class EditApplicationAction extends Action
         if (!$this->app) {
             // TRANS: Client error displayed trying to edit an application that does not exist.
             $this->clientError(_('No such application.'));
-            return false;
         }
 
         return true;
@@ -96,9 +94,9 @@ class EditApplicationAction extends Action
      *
      * @return void
      */
-    function handle($args)
+    function handle()
     {
-        parent::handle($args);
+        parent::handle();
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             $this->handlePost($args);
@@ -130,7 +128,6 @@ class EditApplicationAction extends Action
         if (!$token || $token != common_session_token()) {
             // TRANS: Client error displayed when the session token does not match or is not given.
             $this->clientError(_('There was a problem with your session token.'));
-            return;
         }
 
         $cur = common_current_user();