airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata-php-gateway git commit: minor fix
Date Wed, 27 Jul 2016 23:18:11 GMT
Repository: airavata-php-gateway
Updated Branches:
  refs/heads/develop aaaf44c20 -> 93005a505


minor fix


Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/93005a50
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/93005a50
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/93005a50

Branch: refs/heads/develop
Commit: 93005a50504db22d29ee4b7f08f1569e97a07c30
Parents: aaaf44c
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Wed Jul 27 19:18:08 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Wed Jul 27 19:18:08 2016 -0400

----------------------------------------------------------------------
 app/libraries/Wsis/Wsis.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/93005a50/app/libraries/Wsis/Wsis.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Wsis.php b/app/libraries/Wsis/Wsis.php
index 56c3358..042a9af 100755
--- a/app/libraries/Wsis/Wsis.php
+++ b/app/libraries/Wsis/Wsis.php
@@ -225,7 +225,8 @@ class Wsis {
         }else{
             $roles = $userProfile->roles;
         }
-        $roles = explode(",", $roles);
+        if(!is_array($roles))
+            $roles = explode(",", $roles);
         return array('username'=>$userName, 'email'=>$userProfile->email, 'firstname'=>$userProfile->given_name,
             'lastname'=>$userProfile->family_name, 'roles'=>$roles);
     }


Mime
View raw message