Merge branch 'master' of bitbucket.org:colosa/processmaker

2014-09-25 09:03:38 -04:00
parent efa6ff05d2 92d699a7ae
commit eec9c85c03
44 changed files with 4748 additions and 2042 deletions
--- a/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
+++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/PmPdo.php
@@ -209,7 +209,7 @@ class PmPdo implements \OAuth2\Storage\AuthorizationCodeInterface,

        // the default behavior is to use "username" as the user_id
        return array_merge(array(
-            'user_id' => $username
+            'user_id' => $userInfo['USR_UID'] //$username
        ), $userInfo);
    }