From d5ff4773727180c1abeb8e472f47bef8a0dea68a Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Sat, 3 Jan 2009 16:40:21 +0000 Subject: [PATCH] (bug 16579) Check if session is set --- includes/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/User.php b/includes/User.php index 17abe51550..9fee089c4c 100644 --- a/includes/User.php +++ b/includes/User.php @@ -2321,7 +2321,7 @@ class User { wfRunHooks( 'UserSetCookies', array( $this, &$session, &$cookies ) ); #check for null, since the hook could cause a null value - if ( !is_null( $session ) && !is_null( $_SESSION ) ){ + if ( !is_null( $session ) && isset( $_SESSION ) ){ $_SESSION = $session + $_SESSION; } foreach ( $cookies as $name => $value ) { -- 2.20.1