fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in bugfix/PMC-1427 (pull request #7146)

Browse Source 
PMC-1427

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Paula Quispe
2019-11-27 15:26:27 +00:00
parent 620a7671c7 1be3629112
commit 8b5c8cd666
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/src/ProcessMaker/BusinessModel/User.php
View File

@@ -640,7 +640,7 @@ class User
* @return array Return an array with custom record * @return array Return an array with custom record
* @throws Exception * @throws Exception
*/ */
private function __getUserCustomRecordFromRecord(array $record) private function getUserCustomRecordFromRecord(array $record)
{ {
try { try {
//Get Calendar //Get Calendar
@@ -1084,7 +1084,7 @@ class User
$row = $rsCriteria->getRow(); $row = $rsCriteria->getRow();
//Return //Return
return (!$flagGetRecord) ? $this->__getUserCustomRecordFromRecord($row) : $row; return (!$flagGetRecord) ? $this->getUserCustomRecordFromRecord($row) : $row;
} catch (Exception $e) { } catch (Exception $e) {
throw $e; throw $e;
} }
@@ -1494,7 +1494,7 @@ class User
while ($rsCriteria->next()) { while ($rsCriteria->next()) {
$record = $rsCriteria->getRow(); $record = $rsCriteria->getRow();
$arrayUser[] = ($flagRecord) ? $record : $this->__getUserCustomRecordFromRecord($record); $arrayUser[] = ($flagRecord) ? $record : $this->getUserCustomRecordFromRecord($record);
} }
//Return //Return