Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Made common structure cache. #57

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Made common structure cache. #57

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions core/components/wayfinder/wayfinder.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ public function getFromCache() {
*/
public function setToCache() {
$cacheKeys = $this->getCacheKeys();
$cacheTime = $this->modx->getOption('cacheTime',$this->_config,3600);
$cacheTime = $this->modx->getOption('cacheTime',$this->_config,null) || $cacheTime = (int)$this->modx->getOption('cache_expires', null, 0);
$this->modx->cacheManager->set($cacheKeys['docs'],$this->docs,$cacheTime,$this->_cacheOptions);
$this->modx->cacheManager->set($cacheKeys['children'],$this->hasChildren,$cacheTime,$this->_cacheOptions);
return true;
Expand All @@ -161,14 +161,19 @@ public function getCacheKeys() {
if (!empty($this->_cacheKeys)) return $this->_cacheKeys;

/* generate a UID based on the params passed to Wayfinder and the resource ID
* and the User ID (so that permissions get correctly applied) */
$cacheKey = 'wf-'.$this->modx->user->get('id').'-'.base64_encode(serialize($this->_config));
* and the User ID (so that permissions get correctly applied)
* Also make a UID to be independent of the current page's id,
* so a structure cache can be shared between pages.
*/
$commonConfig = $this->_config;
unset($commonConfig['hereId']);
$cacheKey = 'wf-'.$this->modx->user->get('id').'-'.base64_encode(serialize($commonConfig));
$childrenCacheKey = $cacheKey.'-children';

/* set cache keys to proper Resource cache so will sync with MODX core caching */
/* set cache keys to proper context cache so will sync with MODX core caching */
$this->_cacheKeys = array(
'docs' => $this->modx->resource->getCacheKey().'/'.md5($cacheKey),
'children' => $this->modx->resource->getCacheKey().'/'.md5($childrenCacheKey),
'docs' => $this->modx->context->getCacheKey().'/'.sha1($cacheKey),
'children' => $this->modx->context->getCacheKey().'/'.sha1($childrenCacheKey),
);

$this->_cacheOptions = array(
Expand Down