From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 3 Jan 2009 16:40:21 +0000 (+0000)
Subject: (bug 16579) Check if session is set
X-Git-Tag: 1.31.0-rc.0~43578
X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=d5ff4773727180c1abeb8e472f47bef8a0dea68a;p=lhc%2Fweb%2Fwiklou.git

(bug 16579) Check if session is set
---

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 ) {