From: Jason Richey <jasonr@users.mediawiki.org>
Date: Wed, 15 Oct 2008 22:12:46 +0000 (+0000)
Subject: added a check for a null value when adding session values
X-Git-Tag: 1.31.0-rc.0~44729
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=366b80bc3ea032f05b55880d98df0d7afce734bf;p=lhc%2Fweb%2Fwiklou.git

added a check for a null value when adding session values
---

diff --git a/includes/User.php b/includes/User.php
index 6888de351a..578e3246fc 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2309,7 +2309,10 @@ class User {
 		}
 		
 		wfRunHooks( 'UserSetCookies', array( $this, &$session, &$cookies ) );
-		$_SESSION = $session + $_SESSION;
+		#check for null, since the hook could cause a null value 
+		if ( !is_null( $session ) && !is_null( $_SESSION ) ){
+			$_SESSION = $session + $_SESSION;
+		}
 		foreach ( $cookies as $name => $value ) {
 			if ( $value === false ) {
 				$this->clearCookie( $name );