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

Correccion de conflictos

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2014-05-29 15:38:10 -04:00
parent db6c8fb6f8
commit 8800f47343
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,8 @@ class Translation extends BaseTranslation
while ($rs->next()) { while ($rs->next()) {
$rows[] = $rs->getRow(); $rows[] = $rs->getRow();
} }
$result = new StdClass;
$result = new StdClass();
$result->data = $rows; $result->data = $rows;
$result->totalCount = $totalCount; $result->totalCount = $totalCount;
@@ -635,4 +636,3 @@ class Translation extends BaseTranslation
} }
} }
} }