diff options
author | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 15:55:05 +0100 |
---|---|---|
committer | Andreas Gohr <andi@splitbrain.org> | 2012-03-10 15:55:05 +0100 |
commit | 9189204ab4405b5698d7a4f13131a7a2d6e9d2fe (patch) | |
tree | e166daa0f6d5a260f2835273d0d18788cf50e1e1 /lib/exe/js.php | |
parent | 50fbf1b6522a235e93ba72c50d0f54e09506604a (diff) | |
parent | e67004f5b686076af0dbf00cf574ac643d003cae (diff) | |
download | rpg-9189204ab4405b5698d7a4f13131a7a2d6e9d2fe.tar.gz rpg-9189204ab4405b5698d7a4f13131a7a2d6e9d2fe.tar.bz2 |
Merge branch 'jscachekey'
* jscachekey:
trigger JS_CACHE_USE in lib/exe/js.php
added INIT_LANG_LOAD event
let js.php use multiple caches
Diffstat (limited to 'lib/exe/js.php')
-rw-r--r-- | lib/exe/js.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/exe/js.php b/lib/exe/js.php index 963eebd5f..4b72014b2 100644 --- a/lib/exe/js.php +++ b/lib/exe/js.php @@ -32,8 +32,8 @@ function js_out(){ global $config_cascade; // The generated script depends on some dynamic options - $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'], - '.js'); + $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js'); + $cache->_event = 'JS_CACHE_USE'; // load minified version for some files $min = $conf['compress'] ? '.min' : ''; @@ -79,8 +79,8 @@ function js_out(){ // check cache age & handle conditional request // This may exit if a cache can be used - http_cached($cache->cache, - $cache->useCache(array('files' => $cache_files))); + $cache_ok = $cache->useCache(array('files' => $cache_files)); + http_cached($cache->cache, $cache_ok); // start output buffering and build the script ob_start(); |