From 231fee13d50ceda85a684dac48b58e4538f5845b Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Mon, 28 Apr 2014 15:36:49 -0400 Subject: [PATCH 1/2] removing debug code --- rbac/engine/classes/model/RbacUsersPeer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/rbac/engine/classes/model/RbacUsersPeer.php b/rbac/engine/classes/model/RbacUsersPeer.php index 022747e00..a417b1d7b 100755 --- a/rbac/engine/classes/model/RbacUsersPeer.php +++ b/rbac/engine/classes/model/RbacUsersPeer.php @@ -33,7 +33,6 @@ // include object class //include_once 'classes/model/RbacUsers.php'; -//die("----LAST --as"); /** * Skeleton subclass for performing query and update operations on the 'USERS' table. * From e7360a767ffd5f16510ed0f9cb58c5a04086499b Mon Sep 17 00:00:00 2001 From: Erik Amaru Ortiz Date: Mon, 28 Apr 2014 17:14:34 -0400 Subject: [PATCH 2/2] little fix, when default record does not exist of pm oauth client --- workflow/engine/controllers/adminProxy.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/workflow/engine/controllers/adminProxy.php b/workflow/engine/controllers/adminProxy.php index eec58ac5d..fa21a0648 100644 --- a/workflow/engine/controllers/adminProxy.php +++ b/workflow/engine/controllers/adminProxy.php @@ -1269,7 +1269,12 @@ class adminProxy extends HttpProxyController $data = array('info' => array()); $pmRestClient = OauthClientsPeer::retrieveByPK('x-pm-local-client'); $status = ! empty($pmRestClient); - $row = $pmRestClient->toArray(BasePeer::TYPE_FIELDNAME); + + if ($status) { + $row = $pmRestClient->toArray(BasePeer::TYPE_FIELDNAME); + } else { + $row = array("CLIENT_ID" => ''); + } $data['info'] = array( array(