summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/functions.php8
-rw-r--r--index.php4
-rw-r--r--prefs.php2
3 files changed, 7 insertions, 7 deletions
diff --git a/include/functions.php b/include/functions.php
index 0fd8ef61a..02d0416f8 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2349,9 +2349,9 @@
foreach ($files as $js) {
if (!isset($_GET['debug'])) {
- $cached_file = CACHE_DIR . "/js/".basename($js).".js";
+ $cached_file = CACHE_DIR . "/js/".basename($js);
- if (file_exists($cached_file) && is_readable($cached_file) && filemtime($cached_file) >= filemtime("js/$js.js")) {
+ if (file_exists($cached_file) && is_readable($cached_file) && filemtime($cached_file) >= filemtime("js/$js")) {
list($header, $contents) = explode("\n", file_get_contents($cached_file), 2);
@@ -2365,12 +2365,12 @@
}
}
- $minified = JShrink\Minifier::minify(file_get_contents("js/$js.js"));
+ $minified = JShrink\Minifier::minify(file_get_contents("js/$js"));
file_put_contents($cached_file, "tt-rss:" . VERSION . "\n" . $minified);
$rv .= $minified;
} else {
- $rv .= file_get_contents("js/$js.js"); // no cache in debug mode
+ $rv .= file_get_contents("js/$js"); // no cache in debug mode
}
}
diff --git a/index.php b/index.php
index daa532aa2..a1bcd5643 100644
--- a/index.php
+++ b/index.php
@@ -114,8 +114,8 @@
<?php
require_once 'lib/jshrink/Minifier.php';
- print get_minified_js(array("tt-rss",
- "functions", "feedlist", "viewfeed", "PluginHost"));
+ print get_minified_js(["tt-rss.js",
+ "functions.js", "feedlist.js", "viewfeed.js", "PluginHost.js"]);
foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
if (method_exists($p, "get_js")) {
diff --git a/prefs.php b/prefs.php
index a0fe93b15..bffd5cdf5 100644
--- a/prefs.php
+++ b/prefs.php
@@ -92,7 +92,7 @@
}
}
- print get_minified_js(array("functions", "deprecated", "prefs"));
+ print get_minified_js(["functions.js", "prefs.js"]);
init_js_translations();
?>