From ce4148b89a82415bf1422258aec21cbfef5724fa Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 18 Mar 2013 17:48:17 +0100 Subject: [PATCH] [-] BO : added important check of the default language for ObjectModel multilang properties --- classes/ObjectModel.php | 2 ++ controllers/admin/AdminImportController.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 444d1dfdb..27b09c547 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -859,6 +859,8 @@ abstract class ObjectModelCore $values = $this->$field; if (!is_array($values)) $values = array($this->id_lang => $values); + if (!isset($values[Configuration::get('PS_LANG_DEFAULT')])) + $values[Configuration::get('PS_LANG_DEFAULT')] = ''; foreach ($values as $id_lang => $value) { diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index f8eb332fc..9add527b1 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -645,7 +645,7 @@ class AdminImportControllerCore extends AdminController do $uniqid_path = _PS_UPLOAD_DIR_.uniqid(); while (file_exists($uniqid_path)); file_put_contents($uniqid_path, $field); $tab = ''; - if(!empty($uniqid_path)) + if (!empty($uniqid_path)) { $fd = fopen($uniqid_path, 'r'); $tab = fgetcsv($fd, MAX_LINE_SIZE, $separator);