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

#887 short term fix for preventing ToArgs to alter the content of an object...

Browse Source 
SVN:trunk[3095]
This commit is contained in:
Denis Flaven
2014-03-04 13:58:28 +00:00
parent 404f6772fd
commit 2574a0c8a4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/dbobject.class.php
View File

@@ -2051,7 +2051,7 @@ abstract class DBObject
{ {
$sRemoteName = $oAttDef->IsIndirect() ? $oAttDef->GetExtKeyToRemote().'_friendlyname' : 'friendlyname'; $sRemoteName = $oAttDef->IsIndirect() ? $oAttDef->GetExtKeyToRemote().'_friendlyname' : 'friendlyname';
$oLinkSet = $this->Get($sAttCode); $oLinkSet = clone $this->Get($sAttCode); // Workaround/Safety net for Trac #887
$iLimit = MetaModel::GetConfig()->Get('max_linkset_output'); $iLimit = MetaModel::GetConfig()->Get('max_linkset_output');
if ($iLimit > 0) if ($iLimit > 0)
{ {

2
core/dbobjectset.class.php
View File

@@ -418,7 +418,7 @@ class DBObjectSet
CMDBSource::FreeResult($resQuery); CMDBSource::FreeResult($resQuery);
$this->m_iCount = $aRow['COUNT']; $this->m_iCount = $aRow['COUNT'];
} }
return $this->m_iCount; return $this->m_iCount; // WARNING this value can be wrong, see Trac #887
} }
} }