fernando/luos
1
0
Fork 0
Code Releases Activity

Merged 3.0.1.8 into MT-10

Browse Source
This commit is contained in:
Gustavo Cruz
2016-04-04 16:25:36 -04:00
parent 6ee53a405a 371db57e75
commit 1dbcd9aaad
4 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
View File

@@ -85,7 +85,7 @@ class FilesManager
}
foreach ($aFiles as $aFile) {
$arrayFileUid = $this->getFileManagerUid($sDirectory.$aFile['FILE']);
$fcontent = file_get_contents($sDirectory.$aFile['FILE']);
$fcontent = '';
$fileUid = $arrayFileUid["PRF_UID"];
if ($fileUid != null) {
$oProcessFiles = \ProcessFilesPeer::retrieveByPK($fileUid);

6
workflow/engine/src/ProcessMaker/BusinessModel/Light/NotificationDevice.php
View File

@@ -2,6 +2,7 @@
namespace ProcessMaker\BusinessModel\Light;
use \ProcessMaker\Services\Api;
use G;
class NotificationDevice
@@ -135,7 +136,7 @@ class NotificationDevice
}
} catch (\Exception $e) {
throw new \Exception(\Api::STAT_APP_EXCEPTION, $e->getMessage());
throw new \Exception($e->getMessage(), Api::STAT_APP_EXCEPTION);
}
return $response;
}
@@ -229,8 +230,9 @@ class NotificationDevice
}
}
} catch (\Exception $e) {
throw new \Exception(\Api::STAT_APP_EXCEPTION, $e->getMessage());
throw new \Exception($e->getMessage(), Api::STAT_APP_EXCEPTION);
}
return $response;
}