Skip to content

Commit 76590ce

Browse files
Merge branch '3.4' into 4.3
* 3.4: [Intl] Update the ICU data to 65.1 [VarDumper] fix dumping uninitialized SplFileInfo Added missing translations. Fixed invalid VarDumper upgrade doc. [HttpFoundation] Check if data passed to SessionBagProxy::initialize is an array Don't let falsey usernames slip through
2 parents 3222c9b + 233f40c commit 76590ce

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Session/Storage/NativeSessionStorage.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ protected function loadSession(array &$session = null)
458458

459459
foreach ($bags as $bag) {
460460
$key = $bag->getStorageKey();
461-
$session[$key] = isset($session[$key]) ? $session[$key] : [];
461+
$session[$key] = isset($session[$key]) && \is_array($session[$key]) ? $session[$key] : [];
462462
$bag->initialize($session[$key]);
463463
}
464464

0 commit comments

Comments
 (0)