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

DMaester · Balazs Dianiska · commit f2d8bd43467b · 2015-02-09T14:49:11.000+01:00
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;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -138,8 +138,9 @@ function simplesamlphp_auth_init() {`
`138`	`138`	`$allowed_default_login_roles = variable_get('simplesamlphp_auth_allowdefaultloginroles', array());`
`139`	`139`
`140`	`140`	`// Check if user is allowed default login.`
	`141`	`+ $user_allowed_default_login_roles = array_intersect_key($user->roles, $allowed_default_login_roles);`
`141`	`142`	`if (variable_get('simplesamlphp_auth_allowdefaultlogin', TRUE) &&`
`142`		`- (in_array($user->uid, $allowed_uids) \|\| !empty(array_intersect_key($user->roles, $allowed_default_login_roles)))) {`
	`143`	`+ (in_array($user->uid, $allowed_uids) \|\| !empty($user_allowed_default_login_roles))) {`
`143`	`144`	`$user_allowed_default_login = TRUE;`
`144`	`145`	`}`
`145`	`146`