From ddba283b60e8978b055542c52d5489275f853e24 Mon Sep 17 00:00:00 2001
From: cdujeu <charles@ajaxplorer.info>
Date: Tue, 17 Mar 2015 11:58:36 +0100
Subject: [PATCH] Avoid reapplying role if already in the user's roles.

---
 core/src/plugins/core.auth/class.AbstractAuthDriver.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/plugins/core.auth/class.AbstractAuthDriver.php b/core/src/plugins/core.auth/class.AbstractAuthDriver.php
index 0d11664a0e..e557195016 100644
--- a/core/src/plugins/core.auth/class.AbstractAuthDriver.php
+++ b/core/src/plugins/core.auth/class.AbstractAuthDriver.php
@@ -314,7 +314,7 @@ public function listChildrenGroups($baseGroup = "/")
     public function updateUserObject(&$userObject)
     {
         $applyRole = $this->getOption("AUTO_APPLY_ROLE");
-        if(!empty($applyRole)){
+        if(!empty($applyRole) && !(is_array($userObject->getRoles()) && array_key_exists($applyRole, $userObject->getRoles())) ){
             $rObject = AuthService::getRole($applyRole, true);
             $userObject->addRole($rObject);
             $userObject->save("superuser");