From 17429186eed0f31d6b95395496cb3314aa95fc00 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 5 Jun 2015 16:27:52 -0700 Subject: [PATCH] Fix for an error which could occur for prefs being updated to multi-language. --- e107_handlers/admin_ui.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php index 2811a871c..e052212c9 100644 --- a/e107_handlers/admin_ui.php +++ b/e107_handlers/admin_ui.php @@ -5229,14 +5229,20 @@ class e_admin_ui extends e_admin_controller_ui { $data = $this->getPosted(); - - foreach($data as $key=>$val) { if(!empty($this->prefs[$key]['multilan'])) { - $this->getConfig()->clearPrefCache(); - $this->getConfig()->setPref($key.'/'.e_LANGUAGE, $val); + + if(is_string($this->getConfig()->get($key))) // most likely upgraded to multilan=>true, so reset to an array structure. + { + $this->getConfig()->setPostedData($key, array(e_LANGUAGE => $val), false); + } + else + { + $this->getConfig()->setPref($key.'/'.e_LANGUAGE, $val); + } + } else {