Merge branch 'master' of https://git.gnu.io/aroque/gnu-social into social-master

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

diff --git a/actions/oauthappssettings.php b/actions/oauthappssettings.php
index c98c90dbf8353549065a520e532ddc5e33259f0a..ce532bdf321e601e26260b57dba6f3f5f8a5ae99 100644 (file)
--- a/actions/oauthappssettings.php
+++ b/actions/oauthappssettings.php
@@ -31,7 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR . '/lib/settingsaction.php';
 require_once INSTALLDIR . '/lib/applicationlist.php';
 
 /**
@@ -50,7 +49,7 @@ class OauthappssettingsAction extends SettingsAction
 {
     var $page = 0;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page') + 0) : 1;
@@ -58,7 +57,6 @@ class OauthappssettingsAction extends SettingsAction
         if (!common_logged_in()) {
             // TRANS: Message displayed to an anonymous user trying to view OAuth application list.
             $this->clientError(_('You must be logged in to list your applications.'));
-            return false;
         }
 
         return true;
@@ -166,6 +164,5 @@ class OauthappssettingsAction extends SettingsAction
                               'Try again, please.'));
             return;
         }
-
     }
 }