From aff477dd54b856ab272285b098fb21cf69395023 Mon Sep 17 00:00:00 2001
From: ngleader <ngleader@gmail.com>
Date: Tue, 11 May 2010 10:28:08 +0000
Subject: [PATCH] r7434 fixed

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@7439 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php     | 2 +-
 classes/optimizer/Optimizer.class.php | 5 +++--
 common/script.php                     | 5 ++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 3a1e9d7b7..5058b2c12 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -153,7 +153,7 @@
             else $this->allow_rewrite = false;
 
             // add common JS/CSS files
-            $this->addJsFile("./common/js/jquery.js",true,'',-1000000);
+            $this->addJsFile("./common/js/jquery.js", true, '', -100000);
             $this->addJsFile("./common/js/x.js");
             $this->addJsFile("./common/js/common.js");
 			$this->addJsFile("./common/js/js_app.js");
diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php
index 317be9c61..7ea2363d4 100644
--- a/classes/optimizer/Optimizer.class.php
+++ b/classes/optimizer/Optimizer.class.php
@@ -46,18 +46,19 @@
             if(!count($source_files)) return;
 			
             $files = array();
-			$hash = '';
+			$hash = "";
             foreach($source_files as $key => $file) {
                 if(!$file || !$file['file'] || !file_exists($file['file'])) continue;
                 $file['file'] = $source_files[$key]['file'] = str_replace("\\","/",$file['file']);
                 if(empty($file['optimized']) || preg_match('/^https?:\/\//i', $file['file']) ) $files[] = $file;
                 else{
 					$targets[] = $file;
-					$hash .= $file['file'];
+					$hash .= $file['file']; 
 				}
             }
 
             if(!count($targets)) return $this->_getOptimizedRemoved($files);
+
 			$list_file_hash = md5($hash);
 			$list_file = FileHandler::getRealPath($this->cache_path . $list_file_hash);
 
diff --git a/common/script.php b/common/script.php
index 66e0242a9..86f69f2c1 100644
--- a/common/script.php
+++ b/common/script.php
@@ -51,7 +51,6 @@ if($type == '.css'){
 
 header("Content-Type: ".$content_type."; charset=UTF-8");
 
-/*
 // return 304
 if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
     $modifiedSince = strtotime($_SERVER['HTTP_IF_MODIFIED_SINCE']);
@@ -61,12 +60,12 @@ if (!empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])) {
 		exit;
     }
 }
-*/
+
 header("Cache-Control: private, max-age=2592000"); 
 header("Pragma: cache"); 
 header("Connection: close"); 
 header("Last-Modified: " . substr(gmdate('r', $mtime), 0, -5). "GMT");
-//header("ETag: \"'.dechex($unique).'-".dechex($size)."-'.dechex($mtime).'\""); 
+header("ETag: \"". md5(join(' ', $list)) .'-'. dechex($mtime)."\""); 
 
 
 function printFileList($list){