composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 00:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Internal: fixed the caching of DBObject::ToArgs()

Browse Source 
1) Wasn't reset when the object was written the DB (thus having its ID set)
2) Wasn't taking the argument name into account (the list of placeholders was defined by the first caller)

SVN:trunk[3491]
This commit is contained in:
Romain Quetiez
2015-01-30 10:04:42 +00:00
parent 44fad50031
commit 6bb9754628
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/dbobject.class.php
View File

@@ -844,6 +844,8 @@ abstract class DBObject implements iDisplay
throw new CoreException("Changing the key ({$this->m_iKey} to $iNewKey) on an object (class {".get_class($this).") wich already exists in the Database");
}
$this->m_iKey = $iNewKey;
// Invalidate the argument cache
$this->m_aAsArgs = null;
}
/**
* Get the icon representing this object
@@ -1488,6 +1490,8 @@ abstract class DBObject implements iDisplay
{
// Take the autonumber
$this->m_iKey = $iNewKey;
// Invalidate the argument cache
$this->m_aAsArgs = null;
}
return $this->m_iKey;
}
@@ -2290,6 +2294,10 @@ abstract class DBObject implements iDisplay
public function ToArgs($sArgName = 'this')
{
if (is_null($this->m_aAsArgs))
{
$this->m_aAsArgs = array();
}
if (!array_key_exists($sArgName, $this->m_aAsArgs))
{
$oKPI = new ExecutionKPI();
$aScalarArgs = $this->ToArgsForQuery($sArgName);
@@ -2343,11 +2351,10 @@ abstract class DBObject implements iDisplay
$aScalarArgs[$sArgName.'->html('.$sAttCode.')'] = '<ul><li>'.implode("</li><li>", $aNames).'</li></ul>';
}
}
$this->m_aAsArgs = $aScalarArgs;
$this->m_aAsArgs[$sArgName] = $aScalarArgs;
$oKPI->ComputeStats('ToArgs', get_class($this));
}
return $this->m_aAsArgs;
return $this->m_aAsArgs[$sArgName];
}
// To be optionaly overloaded