diff options
| -rw-r--r-- | itjs.class | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -201,12 +201,13 @@ 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; - $key = "itjs_" . md5(join("", it::map('"$v" . @filemtime("$v")', $filenames)) . '|' . json_encode($p['additional_data'])); + $additional = json_encode($p['additional_data']); + $key = "itjs_" . md5(join("", it::map('"$v" . @filemtime("$v")', $filenames)) . $additional); 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("X" . self::filecontents($filenames)), 0, 10), array('ttl' => 60)); + return it_cache::get($key) ?: it_cache::put($key, substr(md5("X" . self::filecontents($filenames) . $additional), 0, 10), array('ttl' => 60)); } /** |