Performances: do not call getRole() again if role is already loaded i…

…n the loop
pydio · Feb 16, 2015 · c4f6e3c · c4f6e3c
1 parent 5a32597
commit c4f6e3c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -1303,7 +1303,8 @@ public function getUserRoleList($userObject, $rolePrefix, $includeString, $exclu
                     if (isSet($valueFiltersExclude) && in_array(strtolower(substr($roleId, strlen($rolePrefix))), $valueFiltersExclude)) continue;
                     if (isSet($matchFilterInclude) && !preg_match($matchFilterInclude, substr($roleId, strlen($rolePrefix)))) continue;
                     if (isSet($valueFiltersInclude) && !in_array(strtolower(substr($roleId, strlen($rolePrefix))), $valueFiltersInclude)) continue;
-                    $roleObject = AuthService::getRole($roleId);
+                    if(is_a($role, "AJXP_Role")) $roleObject = $role;
+                    else $roleObject = AuthService::getRole($roleId);
                     $label = $roleObject->getLabel();
                     $label = !empty($label) ? $label : substr($roleId, strlen($rolePrefix));
                     $allRoles[$roleId] = $label;