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

release/3.2.2 to develop conflicts

Browse Source
This commit is contained in:
Paula Quispe
2017-10-23 11:37:41 -04:00
parent e7ca3e6887 294707cb42
commit 81c90278bd
185 changed files with 2479 additions and 2209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -735,7 +735,7 @@ class User
$aUserProperty = $userProperty->loadOrCreateIfNotExists($userUid, array("USR_PASSWORD_HISTORY" => serialize(array(Bootstrap::hashPassword($arrayData["USR_PASSWORD"])))));
$memKey = "rbacSession" . session_id();
$memcache = &PMmemcached::getSingleton(defined("SYS_SYS") ? SYS_SYS : "");
$memcache = &PMmemcached::getSingleton(!empty(config("system.workspace")) ? config("system.workspace") : "");
if (($rbac->aUserInfo = $memcache->get($memKey)) == false) {
$rbac->loadUserRolePermission("PROCESSMAKER", $userUidLogged);