From c51f90d7a072929e2b636e986b8ea2121bc5a630 Mon Sep 17 00:00:00 2001
From: Dominik Eckelmann <eckelmann@cosmocode.de>
Date: Tue, 24 Jan 2012 11:12:44 +0100
Subject: let js.php use multiple caches

---
 lib/exe/js.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'lib/exe')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index b7f2fd222..c929c9ba5 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -31,8 +31,14 @@ function js_out(){
     global $lang;
     global $config_cascade;
 
+    if (isset($_GET['cacheKey'])) {
+        $cacheKey = strval($_GET['cacheKey']);
+    } else {
+        $cacheKey = '';
+    }
+
     // The generated script depends on some dynamic options
-    $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],
+    $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$cacheKey,
                        '.js');
 
     // load minified version for some files
-- 
cgit v1.2.3


From e67004f5b686076af0dbf00cf574ac643d003cae Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 7 Feb 2012 19:41:09 +0100
Subject: trigger JS_CACHE_USE in lib/exe/js.php

This removes the cachekey parameter again and instead follows
@michitux's suggestion to trigger an event for the cache usage
---
 lib/exe/js.php | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'lib/exe')

diff --git a/lib/exe/js.php b/lib/exe/js.php
index c929c9ba5..95ca10e87 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -31,15 +31,9 @@ function js_out(){
     global $lang;
     global $config_cascade;
 
-    if (isset($_GET['cacheKey'])) {
-        $cacheKey = strval($_GET['cacheKey']);
-    } else {
-        $cacheKey = '';
-    }
-
     // The generated script depends on some dynamic options
-    $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].$cacheKey,
-                       '.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' : '';
@@ -85,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();
-- 
cgit v1.2.3