Revert 0b595fb/80c5bcd as they break map.search.ch/api/map.js

1 files changed, 4 insertions, 1 deletions

diff --git a/itjs.class b/itjs.class
index 67027eb..0a57465 100644
--- a/itjs.class
+++ b/itjs.class
@@ -198,12 +198,15 @@ static function checksum($fnlist, $p = array())
 	foreach (is_array($fnlist) ? $fnlist : itjs::filenames($fnlist) as $filename)
 		$filenames[] = !file_exists($filename) && file_exists($t = it::replace(array('^/www/[^/]*' => "/www/lib.search.ch"), $filename)) ? $t : $filename;
 
+	if (preg_grep('/jquery(build)\.js/', $filenames)) # jquery files may be included invisibly
+		$filenames = array_merge($filenames, array("/www/lib.search.ch/var/jquery-ui/dist/minified/core.min.js", "/www/lib.search.ch/var/jquery/dist/jquery.min.js"));
+
 	$key = "itjs_" . md5(join("", it::map('"$v" . @filemtime("$v")', $filenames)));
 
 	if ($filenames && $p['short_expire'] && (time() - max(@array_map('filemtime', $filenames)) < 60))
 		return "-"; # trigger short expire, our file may not yet be up to date on other slaves
 	else if ($filenames)
-		return it_cache::get($key) ?: it_cache::put($key, substr(md5(self::filecontents($filenames, it::match('\.(js|css)', join("", $filenames)))), 0, 10), array('ttl' => 60));
+		return it_cache::get($key) ?: it_cache::put($key, substr(md5(self::filecontents($filenames, false)), 0, 10), array('ttl' => 60));
 }
 
 /**