Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/plugins/Event/actions/timelist.php b/plugins/Event/actions/timelist.php
index cb8efb3c1db1985a813a77a16a3e2580cb917ac2..580cfab74eb8f2468dd91b9379ef1430c22e7edf 100644 (file)
--- a/plugins/Event/actions/timelist.php
+++ b/plugins/Event/actions/timelist.php
@@ -42,7 +42,7 @@ class TimelistAction extends Action {
      *
      * @return boolean true
      */
-    function prepare($args) {
+    function prepare(array $args=array()) {
         parent::prepare($args);
         $this->start = $this->arg('start');
         $this->duration = $this->boolean('duration', false);
@@ -56,14 +56,13 @@ class TimelistAction extends Action {
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
         if (!common_logged_in()) {
             // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_m('Not logged in.'));
-            return;
         }
 
         if (!empty($this->start)) {
@@ -71,7 +70,6 @@ class TimelistAction extends Action {
         } else {
             // TRANS: Client error when submitting a form with unexpected information.
             $this->clientError(_m('Unexpected form submission.'));
-            return;
         }
 
         if ($this->boolean('ajax')) {