mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-23 18:48:51 +02:00
Completing the change [3291]: the cron could not trigger a timeout on the stop watches, and the 'persistent' flag was forcibly set to true (whereas we expect the default value to be false!)
SVN:trunk[3383]
This commit is contained in:
@@ -974,8 +974,8 @@ EOF;
|
||||
if($oHighlight)
|
||||
{
|
||||
$sCode = $oHighlight->GetChildText('code');
|
||||
$bPersistent = $this->GetPropBoolean($oHighlight, 'persistent', false);
|
||||
$sHighlight = "'highlight' => array('code' => '$sCode', 'persistent' => ".($bPersistent ? 'true' : 'false')."), ";
|
||||
$sPersistent = $this->GetPropBoolean($oHighlight, 'persistent', false);
|
||||
$sHighlight = "'highlight' => array('code' => '$sCode', 'persistent' => $sPersistent), ";
|
||||
}
|
||||
|
||||
$oActions = $oThreshold->GetUniqueElement('actions');
|
||||
@@ -995,7 +995,7 @@ EOF;
|
||||
{
|
||||
$sParamType = 'string';
|
||||
}
|
||||
$aActionParams[] = "array('type' => '$sParamType', 'value' => '".self::QuoteForPHP($oParam->textContent)."')";
|
||||
$aActionParams[] = "array('type' => '$sParamType', 'value' => ".self::QuoteForPHP($oParam->textContent).")";
|
||||
}
|
||||
}
|
||||
$sActionParams = 'array('.implode(', ', $aActionParams).')';
|
||||
@@ -1243,7 +1243,7 @@ EOF;
|
||||
{
|
||||
$sParamType = 'string';
|
||||
}
|
||||
$aActionParams[] = "array('type' => '$sType', 'value' => '".self::QuoteForPHP($oParam->textContent)."')";
|
||||
$aActionParams[] = "array('type' => '$sType', 'value' => ".self::QuoteForPHP($oParam->textContent).")";
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user