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

Reintegrated from branch 1.2: capability to develop a module to share objects between organizations (beta)

Browse Source 
SVN:trunk[1859]
This commit is contained in:
Romain Quetiez
2012-02-17 15:11:00 +00:00
parent 92c1a4af63
commit b3dadcba77
17 changed files with 433 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/dbobjectsearch.class.php
View File

@@ -807,7 +807,7 @@ class DBObjectSearch
public function serialize($bDevelopParams = false, $aContextParams = null)
{
$sOql = $this->ToOql($bDevelopParams, $aContextParams);
return base64_encode(serialize(array($sOql, $this->m_aParams)));
return base64_encode(serialize(array($sOql, $this->m_aParams, $this->m_aModifierProperties)));
}
static public function unserialize($sValue)
@@ -818,7 +818,9 @@ class DBObjectSearch
// We've tried to use gzcompress/gzuncompress, but for some specific queries
// it was not working at all (See Trac #193)
// gzuncompress was issuing a warning "data error" and the return object was null
return self::FromOQL($sOql, $aParams);
$oRetFilter = self::FromOQL($sOql, $aParams);
$oRetFilter->m_aModifierProperties = $aData[2];
return $oRetFilter;
}
// SImple BUt Structured Query Languag - SubuSQL