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

ormStopWatch::GetElapsedTime not working in case of queries containing :this-> parameters (the prototype of GetElapsedTime has changed and is NOT compatible with the previous one)

Browse Source 
SVN:trunk[3564]
This commit is contained in:
Romain Quetiez
2015-04-27 09:24:09 +00:00
parent 161a92fef2
commit ec97e6d2e0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/ormstopwatch.class.inc.php
View File

@@ -86,8 +86,9 @@ class ormStopWatch
* Get the working elapsed time since the start of the stop watch
* even if it is currently running
* @param oAttDef AttributeDefinition Attribute hosting the stop watch
* @param oObject Hosting object (used for query parameters)
*/
public function GetElapsedTime($oAttDef)
public function GetElapsedTime($oAttDef, $oObject)
{
if (is_null($this->iLastStart))
{
@@ -95,7 +96,7 @@ class ormStopWatch
}
else
{
$iElapsed = $this->ComputeDuration($this, $oAttDef, $this->iLastStart, time());
$iElapsed = $this->ComputeDuration($oObject, $oAttDef, $this->iLastStart, time());
return $this->iTimeSpent + $iElapsed;
}
}