diff options
author | Sem <sembrestels@riseup.net> | 2014-01-22 04:05:47 +0100 |
---|---|---|
committer | Sem <sembrestels@riseup.net> | 2014-01-22 04:05:47 +0100 |
commit | 68614b769f4ae4f28c3f395f47b68baba7c48c64 (patch) | |
tree | 2c5a744a3859d27883f92b72aef9cf81f1a947d0 /engine/handlers/cache_handler.php | |
parent | 69e2d8c5d8732042c9319aef1fdea45a82b63e42 (diff) | |
parent | c0295c275d6edbca6c6c8bb51dc199150d0d5fc3 (diff) | |
download | elgg-68614b769f4ae4f28c3f395f47b68baba7c48c64.tar.gz elgg-68614b769f4ae4f28c3f395f47b68baba7c48c64.tar.bz2 |
Merge branch 'release/1.8.1'
Diffstat (limited to 'engine/handlers/cache_handler.php')
-rw-r--r-- | engine/handlers/cache_handler.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/engine/handlers/cache_handler.php b/engine/handlers/cache_handler.php index 7706c2c92..36fc665bb 100644 --- a/engine/handlers/cache_handler.php +++ b/engine/handlers/cache_handler.php @@ -88,15 +88,18 @@ header("ETag: \"$etag\""); $filename = $dataroot . 'views_simplecache/' . md5($viewtype . $view); if (file_exists($filename)) { - $contents = file_get_contents($filename); + readfile($filename); } else { // someone trying to access a non-cached file or a race condition with cache flushing mysql_close($mysql_dblink); require_once(dirname(dirname(__FILE__)) . "/start.php"); - elgg_regenerate_simplecache(); + + global $CONFIG; + if (!in_array($view, $CONFIG->views->simplecache)) { + header("HTTP/1.1 404 Not Found"); + exit; + } elgg_set_viewtype($viewtype); - $contents = elgg_view($view); + echo elgg_view($view); } - -echo $contents; |