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

Fix for a warning about mysql_free() revealing a problem with DBObjectSet

Browse Source 
SVN:trunk[3257]
This commit is contained in:
Denis Flaven
2014-07-10 08:27:16 +00:00
parent 4c44159a88
commit 67471e2636
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/dbobjectsearch.class.php
View File

@@ -72,11 +72,11 @@ class DBObjectSearch
}
/**
* Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects
* Perform a deep clone (as opposed to "clone" which does copy a reference to the underlying objects)
**/
public function DeepClone()
{
return unserialize(serialize($this));
return unserialize(serialize($this)); // Beware this serializes/unserializes the search and its parameters as well
}
public function AllowAllData() {$this->m_bAllowAllData = true;}

12
core/dbobjectset.class.php
View File

@@ -112,7 +112,17 @@ class DBObjectSet
$this->m_oSQLResult = null;
}
/**
* Called when unserializing a DBObjectSet
*/
public function __wakeup()
{
$this->m_iNumTotalDBRows = null; // Total number of rows for the query without LIMIT. null if unknown yet
$this->m_iNumLoadedDBRows = 0; // Total number of rows LOADED in $this->m_oSQLResult via a SQL query. 0 by default
$this->m_bLoaded = false; // true when the filter has been used OR the set is built step by step (AddObject...)
$this->m_iCurrRow = 0;
$this->m_oSQLResult = null;
}
/**
* Specify the subset of attributes to load (for each class of objects) before performing the SQL query for retrieving the rows from the DB
*