Merge remote-tracking branch 'upstream/master'

1 files changed, 4 insertions, 9 deletions

diff --git a/prefs.php b/prefs.php
index b4ab3689d..0b9cb3cf2 100644
--- a/prefs.php
+++ b/prefs.php
@@ -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>