fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'upstream/3.0.1.6' into 3.0.1.6-Gmail

Browse Source
This commit is contained in:
Dante
2015-11-25 14:26:33 -04:00
parent 824763602f 5ec3c483ae
commit 9691cfad4c
18 changed files with 260 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -388,7 +388,7 @@ class FilesManager
if ($path == '') {
throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('prf_uid')));
}
$sFile = end(explode(DIRECTORY_SEPARATOR,$path));
$sFile = basename($path);
$sPath = str_replace($sFile,'',$path);
$sSubDirectory = substr(str_replace($sProcessUID,'',substr($sPath,(strpos($sPath, $sProcessUID)))),0,-1);
$sMainDirectory = str_replace(substr($sPath, strpos($sPath, $sProcessUID)),'', $sPath);

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

@@ -596,8 +596,12 @@ class User
$rbac->initRBAC();
if (isset($arrayData["USR_NEW_PASS"])) {
$arrayData["USR_PASSWORD"] = \Bootstrap::hashPassword($arrayData["USR_NEW_PASS"]);
if (isset($arrayData['USR_PASSWORD'])) {
$arrayData['USR_PASSWORD'] = \Bootstrap::hashPassword($arrayData['USR_PASSWORD']);
} else {
if (isset($arrayData['USR_NEW_PASS'])) {
$arrayData['USR_PASSWORD'] = \Bootstrap::hashPassword($arrayData['USR_NEW_PASS']);
}
}
$arrayData["USR_UID"] = $userUid;