Index: trunk/phase3/includes/User.php |
— | — | @@ -2321,7 +2321,7 @@ |
2322 | 2322 | |
2323 | 2323 | wfRunHooks( 'UserSetCookies', array( $this, &$session, &$cookies ) ); |
2324 | 2324 | #check for null, since the hook could cause a null value |
2325 | | - if ( !is_null( $session ) && !is_null( $_SESSION ) ){ |
| 2325 | + if ( !is_null( $session ) && isset( $_SESSION ) ){ |
2326 | 2326 | $_SESSION = $session + $_SESSION; |
2327 | 2327 | } |
2328 | 2328 | foreach ( $cookies as $name => $value ) { |