mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 18:14:26 +02:00
Code Issues Releases Wiki Activity

Refactored e_tree_model::setCacheString()

Browse Source
This commit is contained in:
Deltik
2018-02-02 11:04:21 -06:00
parent 6df1a18d9f
commit 8bfa29d2cc
1 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
e107_handlers/model_class.php
View File

@@ -1869,7 +1869,7 @@ class e_model extends e_object
} }
/** /**
* Base e107 Fron Model class interface * Base e107 Front Model class interface
* *
* Some important points: * Some important points:
* - model data should be always in toDB() format: * - model data should be always in toDB() format:
@@ -3222,6 +3222,29 @@ class e_tree_model extends e_front_model
return $this->_cache_string; return $this->_cache_string;
} }
public function setCacheString($str = null)
{
if(isset($str))
return parent::setCacheString($str);
if($this->isCacheEnabled() && !$this->getParam('noCacheStringModify'))
{
$str = !$this->getParam('db_query')
?
$this->getModelTable()
.$this->getParam('nocount')
.$this->getParam('db_where')
.$this->getParam('db_order')
.$this->getParam('db_limit')
:
$this->getParam('db_query');
return $this->setCacheString($this->getCacheString().'_'.md5($str));
}
return parent::setCacheString($str);
}
protected function _setCacheData() protected function _setCacheData()
{ {
if(!$this->isCacheEnabled()) if(!$this->isCacheEnabled())
@@ -3274,12 +3297,6 @@ class e_tree_model extends e_front_model
*/ */
public function load($force = false) public function load($force = false)
{ {
// XXX What would break if changed to the most proper isTree()?
if(!$force && $this->isTree()) //!$this->isEmpty()
{
return $this;
}
if ($force) if ($force)
{ {
$this->unsetTree() $this->unsetTree()
@@ -3288,21 +3305,13 @@ class e_tree_model extends e_front_model
$this->_total = false; $this->_total = false;
} }
if($this->isCacheEnabled() && !$this->getParam('noCacheStringModify')) // XXX What would break if changed to the most proper isTree()?
elseif($this->isTree()) //!$this->isEmpty()
{ {
$str = !$this->getParam('db_query') return $this;
?
$this->getModelTable()
.$this->getParam('nocount')
.$this->getParam('db_where')
.$this->getParam('db_order')
.$this->getParam('db_limit')
:
$this->getParam('db_query');
$this->setCacheString($this->getCacheString().'_'.md5($str));
} }
$this->setCacheString();
$cached = $this->_getCacheData(); $cached = $this->_getCacheData();
if($cached !== false) if($cached !== false)
{ {