Skip to content
Snippets Groups Projects
Commit cae089df authored by Bart Visscher's avatar Bart Visscher
Browse files

Cache: Create global cache in OC_Cache

parent fb53708d
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,21 @@ ...@@ -8,7 +8,21 @@
class OC_Cache { class OC_Cache {
static protected $cache; static protected $cache;
static protected $global_cache;
static public function getGlobalCache() {
if (!self::$global_cache) {
self::$global_cache = new OC_Cache_FileGlobal();
}
return self::$global_cache;
}
static public function getUserCache() {
if (!self::$cache) {
self::init();
}
return self::$cache;
}
static protected function init() { static protected function init() {
$fast_cache = null; $fast_cache = null;
if (!$fast_cache && function_exists('xcache_set')) { if (!$fast_cache && function_exists('xcache_set')) {
......
...@@ -22,7 +22,7 @@ abstract class OC_Minimizer { ...@@ -22,7 +22,7 @@ abstract class OC_Minimizer {
OC_Response::setLastModifiedHeader($last_modified); OC_Response::setLastModifiedHeader($last_modified);
$gzout = false; $gzout = false;
$cache = new OC_Cache_FileGlobal(); $cache = OC_Cache::getGlobalCache();
if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)){ if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)){
$gzout = $cache->get($cache_key.'.gz'); $gzout = $cache->get($cache_key.'.gz');
OC_Response::setETagHeader(md5($gzout)); OC_Response::setETagHeader(md5($gzout));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment