fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged 3.0.1.8 into MT-10

Browse Source
This commit is contained in:
Gustavo Cruz
2016-04-02 11:11:35 -04:00
parent d03c08ffab c786f1ece1
commit 58b21bf312
19 changed files with 605 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
workflow/engine/classes/model/AddonsManager.php
View File

@@ -320,6 +320,9 @@ class AddonsManager extends BaseAddonsManager
}
$start = microtime(true);
$rate = null;
$position = null;
$elapsed = null;
while (!feof($handle)) {
$this->refresh();

4
workflow/engine/classes/model/AppDelay.php
View File

@@ -98,7 +98,7 @@ class AppDelay extends BaseAppDelay
$oCriteria->add(AppDelayPeer::APP_TYPE, 'PAUSE');
$oCriteria->add(
$oCriteria->getNewCriterion(AppDelayPeer::APP_DISABLE_ACTION_USER, 0, Criteria::EQUAL)->addOr(
$oCriteria->getNewCriterion(AppDelayPeer::APP_DISABLE_ACTION_USER, null, Criteria::ISNULL))
$oCriteria->getNewCriterion(AppDelayPeer::APP_DISABLE_ACTION_USER, null, Criteria::ISNULL))
);
$oDataset = AppDelayPeer::doSelectRS($oCriteria);
@@ -106,7 +106,7 @@ class AppDelay extends BaseAppDelay
$oDataset->next();
$aRow = $oDataset->getRow();
if ( $aRow ) {
if ($aRow) {
return true;
} else {
return false;