diff options
| author | VOC | 2015-11-14 13:08:00 +0100 |
|---|---|---|
| committer | VOC | 2015-11-14 13:08:00 +0100 |
| commit | 9e479de7fe3fa4d70ba223ec2511484991f46dab (patch) | |
| tree | 915b467f78f98dc100c6376c17edec51eba2d49f | |
| parent | a20d9a3db5b8d0a394d806386f2736de591954b8 (diff) | |
| parent | 4faea446cd5cf1d1794b8b1a6779e2bb96816d0a (diff) | |
Merge branch 'master' of c3voc.de:streaming-website
| -rw-r--r-- | configs/conferences/ppw15b/config.php | 2 | ||||
| -rw-r--r-- | lib/less.php/Cache.php | 9 |
2 files changed, 5 insertions, 6 deletions
diff --git a/configs/conferences/ppw15b/config.php b/configs/conferences/ppw15b/config.php index 6541729..94859c0 100644 --- a/configs/conferences/ppw15b/config.php +++ b/configs/conferences/ppw15b/config.php @@ -86,7 +86,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array( * Link zu den Recordings * Wird diese Zeile auskommentiert, wird der Link nicht angezeigt */ - //'RELEASES' => 'https://media.ccc.de/browse/events/datengarten/index.html', + 'RELEASES' => 'https://www.youtube.com/playlist?list=PLIoqMTM7qDWolqxEiNIX4rVLa8lAqT10_', /** * Link zu einer (externen) ReLive-Übersichts-Seite diff --git a/lib/less.php/Cache.php b/lib/less.php/Cache.php index 8c8be39..bf5bf92 100644 --- a/lib/less.php/Cache.php +++ b/lib/less.php/Cache.php @@ -83,13 +83,12 @@ class Less_Cache{ $hash = md5(json_encode($less_files)); $list_file = Less_Cache::$cache_dir . Less_Cache::$prefix . $hash . '.list'; - // check cached content if( !isset($parser_options['use_cache']) || $parser_options['use_cache'] === true ){ if( file_exists($list_file) ){ self::ListFiles($list_file, $list, $cached_name); - $compiled_name = self::CompiledName($list); + $compiled_name = self::CompiledName($list, $hash); // if $cached_name is the same as the $compiled name, don't regenerate if( !$cached_name || $cached_name === $compiled_name ){ @@ -109,7 +108,7 @@ class Less_Cache{ return false; } - $compiled_name = self::CompiledName( $less_files ); + $compiled_name = self::CompiledName( $less_files, $hash ); $output_file = self::OutputFile($compiled_name, $parser_options ); @@ -194,7 +193,7 @@ class Less_Cache{ } - private static function CompiledName( $files ){ + private static function CompiledName( $files, $extrahash ){ //save the file list $temp = array(Less_Version::cache_version); @@ -202,7 +201,7 @@ class Less_Cache{ $temp[] = filemtime($file)."\t".filesize($file)."\t".$file; } - return Less_Cache::$prefix.sha1(json_encode($temp)).'.css'; + return Less_Cache::$prefix.sha1(json_encode($temp).$extrahash).'.css'; } |