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

Merged in release/3.4.4 (pull request #7197)

Browse Source 
3.4.4: Update the feature with the last official build

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2019-12-20 14:02:38 +00:00
parent 8a54785b52 3d9bc16480
commit 1008ee1ee3
47 changed files with 411 additions and 675 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/Configuration.php
View File

@@ -103,7 +103,7 @@ class Configuration extends BaseConfiguration
public function exists($CfgUid, $ObjUid = "", $ProUid = "", $UsrUid = "", $AppUid = "")
{
$oRow = ConfigurationPeer::retrieveByPK( $CfgUid, $ObjUid, $ProUid, $UsrUid, $AppUid );
return (( get_class ($oRow) == 'Configuration' )&&(!is_null($oRow)));
return (!is_null($oRow) && get_class($oRow) === 'Configuration');
}
public function getAll ()

2
workflow/engine/classes/model/Translation.php
View File

@@ -237,7 +237,7 @@ class Translation extends BaseTranslation
}
$res['cacheFileMafe'] = $cacheFileMafe;
$res['languague'] = count($cacheFileMafe);
$res['languague'] = (is_array($cacheFileMafe) || $cacheFileMafe instanceof Countable) ? count($cacheFileMafe) : 0;
$res['rowsMafeJS'] = count( $translation );
return $res;
} catch (Exception $e) {