Issue #2420087 by DMaester: Fatal error in all PHP versions prior to 5.5

drupalprojects · Feb 9, 2015 · f2d8bd4 · f2d8bd4
1 parent 68fa312
commit f2d8bd4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/simplesamlphp_auth.module b/simplesamlphp_auth.module
@@ -138,8 +138,9 @@ function simplesamlphp_auth_init() {
   $allowed_default_login_roles = variable_get('simplesamlphp_auth_allowdefaultloginroles', array());
 
   // Check if user is allowed default login.
+  $user_allowed_default_login_roles = array_intersect_key($user->roles, $allowed_default_login_roles);
   if (variable_get('simplesamlphp_auth_allowdefaultlogin', TRUE) &&
-    (in_array($user->uid, $allowed_uids) || !empty(array_intersect_key($user->roles, $allowed_default_login_roles)))) {
+    (in_array($user->uid, $allowed_uids) || !empty($user_allowed_default_login_roles))) {
     $user_allowed_default_login = TRUE;
   }