mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX: Prevent notice-level error in Session code when non-array is turned into an array.
This commit is contained in:
parent
f72c77e984
commit
f8206d15c8
@ -415,7 +415,7 @@ class Session {
|
|||||||
protected function recursivelyApply($data, &$dest) {
|
protected function recursivelyApply($data, &$dest) {
|
||||||
foreach($data as $k => $v) {
|
foreach($data as $k => $v) {
|
||||||
if(is_array($v)) {
|
if(is_array($v)) {
|
||||||
if(!isset($dest[$k])) $dest[$k] = array();
|
if(!isset($dest[$k]) || !is_array($dest[$k])) $dest[$k] = array();
|
||||||
$this->recursivelyApply($v, $dest[$k]);
|
$this->recursivelyApply($v, $dest[$k]);
|
||||||
} else {
|
} else {
|
||||||
$dest[$k] = $v;
|
$dest[$k] = $v;
|
||||||
|
Loading…
Reference in New Issue
Block a user