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

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

diff --git a/plugins/Minify/MinifyPlugin.php b/plugins/Minify/MinifyPlugin.php
index 4041b228aee41f02ed7e71587dc102ce68648cfa..cb51e980f3760c95e5345b16a77a032f8c72c877 100644 (file)
--- a/plugins/Minify/MinifyPlugin.php
+++ b/plugins/Minify/MinifyPlugin.php
@@ -58,18 +58,6 @@ class MinifyPlugin extends Plugin
         return true;
     }
 
-    function onAutoload($cls)
-    {
-        switch ($cls)
-        {
-         case 'MinifyAction':
-            require_once(INSTALLDIR.'/plugins/Minify/' . strtolower(mb_substr($cls, 0, -6)) . '.php');
-            return false;
-         default:
-            return true;
-        }
-    }
-
     function onLoginAction($action, &$login)
     {
         switch ($action)
@@ -156,7 +144,7 @@ class MinifyPlugin extends Plugin
     }
 
     function minifyUrl($src) {
-        return common_local_url('minify',null,array('f' => $src ,v => STATUSNET_VERSION));
+        return common_local_url('minify',null,array('f' => $src ,v => GNUSOCIAL_VERSION));
     }
 
     static function minifyJs($code) {
@@ -164,15 +152,15 @@ class MinifyPlugin extends Plugin
         return JSMin::minify($code);
     }
 
-    static function minifyCss($code, $options = array()) {
+    static function minifyCss($code, array $options = array()) {
         require_once('Minify/CSS.php');
         return Minify_CSS::minify($code,$options);
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Minify',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:Minify',
                             'rawdescription' =>