Commit 8625dfc7 authored by alexpott's avatar alexpott

Issue #2002412 by marlatt, davmorr: Rename Views method cache_set_expire() to cacheSetExpire().

parent dca8035d
......@@ -105,7 +105,7 @@ protected function cacheExpire($type) { }
* @param $type
* The cache type, either 'query', 'result' or 'output'.
*/
function cache_set_expire($type) {
protected function cacheSetExpire($type) {
return CacheBackendInterface::CACHE_PERMANENT;
}
......@@ -126,12 +126,12 @@ public function cacheSet($type) {
'total_rows' => isset($this->view->total_rows) ? $this->view->total_rows : 0,
'current_page' => $this->view->getCurrentPage(),
);
cache($this->table)->set($this->generateResultsKey(), $data, $this->cache_set_expire($type));
cache($this->table)->set($this->generateResultsKey(), $data, $this->cacheSetExpire($type));
break;
case 'output':
$this->storage['output'] = $this->view->display_handler->output;
$this->gather_headers();
cache($this->table)->set($this->generateOutputKey(), $this->storage, $this->cache_set_expire($type));
cache($this->table)->set($this->generateOutputKey(), $this->storage, $this->cacheSetExpire($type));
break;
}
}
......
......@@ -118,7 +118,7 @@ protected function cacheExpire($type) {
}
}
function cache_set_expire($type) {
protected function cacheSetExpire($type) {
$lifespan = $this->getLifespan($type);
if ($lifespan) {
return time() + $lifespan;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment