(bug 16579) Check if session is set

diff --git a/includes/User.php b/includes/User.php
index 17abe51..9fee089 100644 (file)
--- 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 ) {