|
|
@@ -37,7 +37,7 @@ class Zend_Cache_Manager
|
|
|
* Constant holding reserved name for default Page Cache
|
|
|
*/
|
|
|
const PAGECACHE = 'page';
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* Constant holding reserved name for default Page Tag Cache
|
|
|
*/
|
|
|
@@ -160,8 +160,8 @@ class Zend_Cache_Manager
|
|
|
return $this->_caches[$name];
|
|
|
}
|
|
|
if (isset($this->_optionTemplates[$name])) {
|
|
|
- if ($name == self::PAGECACHE
|
|
|
- && (!isset($this->_optionTemplates[$name]['backend']['options']['tag_cache'])
|
|
|
+ if ($name == self::PAGECACHE
|
|
|
+ && (!isset($this->_optionTemplates[$name]['backend']['options']['tag_cache'])
|
|
|
|| !$this->_optionTemplates[$name]['backend']['options']['tag_cache'] instanceof Zend_Cache_Core)
|
|
|
) {
|
|
|
$this->_optionTemplates[$name]['backend']['options']['tag_cache']
|
|
|
@@ -171,7 +171,10 @@ class Zend_Cache_Manager
|
|
|
$this->_optionTemplates[$name]['frontend']['name'],
|
|
|
$this->_optionTemplates[$name]['backend']['name'],
|
|
|
isset($this->_optionTemplates[$name]['frontend']['options']) ? $this->_optionTemplates[$name]['frontend']['options'] : array(),
|
|
|
- isset($this->_optionTemplates[$name]['backend']['options']) ? $this->_optionTemplates[$name]['backend']['options'] : array()
|
|
|
+ isset($this->_optionTemplates[$name]['backend']['options']) ? $this->_optionTemplates[$name]['backend']['options'] : array(),
|
|
|
+ isset($this->_optionTemplates[$name]['frontend']['customFrontendNaming']) ? $this->_optionTemplates[$name]['frontend']['customFrontendNaming'] : false,
|
|
|
+ isset($this->_optionTemplates[$name]['backend']['customBackendNaming']) ? $this->_optionTemplates[$name]['backend']['customBackendNaming'] : false,
|
|
|
+ isset($this->_optionTemplates[$name]['frontendBackendAutoload']) ? $this->_optionTemplates[$name]['frontendBackendAutoload'] : false
|
|
|
);
|
|
|
return $this->_caches[$name];
|
|
|
}
|