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

[quix0rs-gnu-social.git] / plugins / Minify / actions / minify.php

diff --git a/plugins/Minify/actions/minify.php b/plugins/Minify/actions/minify.php
index b7bee7c8815e572b6a4fa301a7b608fe951383df..671e22f5a64889d3d98d658d5d4581a8b70d7917 100644 (file)
--- a/plugins/Minify/actions/minify.php
+++ b/plugins/Minify/actions/minify.php
@@ -30,12 +30,12 @@ class MinifyAction extends Action
     var $file;
     var $v;
 
-    function isReadOnly($args)
+    function isReadOnly(array $args=array())
     {
         return true;
     }
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
         $this->v = $args['v'];
@@ -48,12 +48,10 @@ class MinifyAction extends Action
             } else {
                 // TRANS: Client error displayed when not providing a valid path in parameter "f".
                 $this->clientError(_m('The parameter "f" is not a valid path.'),404);
-                return false;
             }
         }else{
             // TRANS: Client error displayed when not providing parameter "f".
             $this->clientError(_m('The parameter "f" is required but missing.'),500);
-            return false;
         }
     }
 
@@ -72,7 +70,7 @@ class MinifyAction extends Action
         return filemtime($this->file);
     }
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
 
@@ -112,7 +110,6 @@ class MinifyAction extends Action
             default:
                 // TRANS: Client error displayed when trying to minify an unsupported file type.
                 $this->clientError(_m('File type not supported.'),500);
-                return false;
         }
         return $out;
     }