BUGFIX: Prevent notice-level error in Session code when non-array is …

…turned into an array.
silverstripe · Jan 29, 2013 · f8206d1 · f8206d1
1 parent f72c77e
commit f8206d1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/control/Session.php b/control/Session.php
@@ -415,7 +415,7 @@ public function inst_save() {
 	protected function recursivelyApply($data, &$dest) {
 		foreach($data as $k => $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]);
 			} else {
 				$dest[$k] = $v;