diff options
author | Richard Beales <[email protected]> | 2013-03-18 07:32:01 +0000 |
---|---|---|
committer | Richard Beales <[email protected]> | 2013-03-18 07:32:01 +0000 |
commit | 7c97d17aaf373339a8bcd917ad59ca6018148f0d (patch) | |
tree | 5a3c04f0f9529be392c1263d3feb75806eb43797 /prefs.php | |
parent | 70db7424e7068701e60cc5bcdfe8f858be508179 (diff) | |
parent | c670a80ddd9b03bd4ea6d940a9ed682fd26248d7 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'prefs.php')
-rw-r--r-- | prefs.php | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -44,23 +44,18 @@ <script type="text/javascript"> <?php - require 'lib/jsmin.php'; + require 'lib/jshrink/Minifier.php'; global $pluginhost; foreach ($pluginhost->get_plugins() as $n => $p) { if (method_exists($p, "get_prefs_js")) { - echo JSMin::minify($p->get_prefs_js()); + echo JShrink\Minifier::minify($p->get_prefs_js()); } } - foreach (array("functions", "deprecated", "prefs") as $js) { - if (!isset($_GET['debug'])) { - echo JSMin::minify(file_get_contents("js/$js.js")); - } else { - echo file_get_contents("js/$js.js"); - } - } + print get_minified_js(array("functions", "deprecated", "prefs")); + ?> </script> |