diff options
| author | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 | 
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-11-18 07:32:27 +0100 | 
| commit | e53d410129701ea1c9d19529afa493f11b5f5b70 (patch) | |
| tree | d9963b24bf8932654b4a47e36602c75975e50dba /engine/handlers/cache_handler.php | |
| parent | 377da25d2965c64941f83baae119fc970ec60982 (diff) | |
| parent | 08a962c98e2923724f8013d6eaae89101243752a (diff) | |
| download | elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.gz elgg-e53d410129701ea1c9d19529afa493f11b5f5b70.tar.bz2 | |
Merge github.com:Elgg/Elgg
Conflicts:
	engine/lib/input.php
Diffstat (limited to 'engine/handlers/cache_handler.php')
| -rw-r--r-- | engine/handlers/cache_handler.php | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/engine/handlers/cache_handler.php b/engine/handlers/cache_handler.php index 7d6f42dc3..94a0e64e9 100644 --- a/engine/handlers/cache_handler.php +++ b/engine/handlers/cache_handler.php @@ -64,7 +64,7 @@ $view = $matches[3];  switch ($type) {  	case 'css':  		header("Content-type: text/css", true); -		header('Expires: ' . date('r', time() + 86400000), true); +		header('Expires: ' . date('r', strtotime("+6 months")), true);  		header("Pragma: public", true);  		header("Cache-Control: public", true); @@ -72,7 +72,7 @@ switch ($type) {  		break;  	case 'js':  		header('Content-type: text/javascript', true); -		header('Expires: ' . date('r', time() + 864000000), true); +		header('Expires: ' . date('r', strtotime("+6 months")), true);  		header("Pragma: public", true);  		header("Cache-Control: public", true); | 
