From: Andrew Dolgov <noreply@fakecake.org>
Date: Tue, 19 Aug 2014 10:50:25 +0000 (+0400)
Subject: get_minified_js: store and check tt-rss version in cached files
X-Git-Tag: 1.14~23
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=aa9f7d444729c3136e0549518eebf0c4c108d818;p=tt-rss.git

get_minified_js: store and check tt-rss version in cached files
---

diff --git a/include/functions2.php b/include/functions2.php
index 07024d38..9d8bc76a 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -2287,19 +2287,26 @@
 			if (!isset($_GET['debug'])) {
 				$cached_file = CACHE_DIR . "/js/".basename($js).".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.js")) {
 
-					$rv .= file_get_contents($cached_file);
+					list($header, $contents) = explode("\n", file_get_contents($cached_file), 2);
 
-				} else {
-					$minified = JShrink\Minifier::minify(file_get_contents("js/$js.js"));
-					file_put_contents($cached_file, $minified);
-					$rv .= $minified;
+					if ($header && $contents) {
+						list($htag, $hversion) = explode(":", $header);
+
+						if ($htag == "tt-rss" && $hversion == VERSION) {
+							$rv .= $contents;
+							continue;
+						}
+					}
 				}
+
+				$minified = JShrink\Minifier::minify(file_get_contents("js/$js.js"));
+				file_put_contents($cached_file, "tt-rss:" . VERSION . "\n" . $minified);
+				$rv .= $minified;
+
 			} else {
-				$rv .= file_get_contents("js/$js.js");
+				$rv .= file_get_contents("js/$js.js"); // no cache in debug mode
 			}
 		}