Merge pull request #11876 from Dan-Orchard/develop

CO: Fix lang table multi-store data issue
PrestaShop · Dec 21, 2018 · d8f3e85 · d8f3e85
2 parents cbe2204 + dc6ed1c
commit d8f3e85
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php
@@ -537,6 +537,8 @@ public function add($auto_date = true, $null_values = false)
             $this->date_upd = date('Y-m-d H:i:s');
         }
 
+        $id_shop_list = Shop::getCompleteListOfShopsID();
+
         if (Shop::isTableAssociated($this->def['table'])) {
             $id_shop_list = Shop::getContextListShopID();
             if (count($this->id_shop_list)) {
@@ -574,7 +576,6 @@ public function add($auto_date = true, $null_values = false)
         if (!empty($this->def['multilang'])) {
             $fields = $this->getFieldsLang();
             if ($fields && is_array($fields)) {
-                $shops = Shop::getCompleteListOfShopsID();
                 $asso = Shop::getAssoTable($this->def['table'] . '_lang');
                 foreach ($fields as $field) {
                     foreach (array_keys($field) as $key) {
@@ -585,7 +586,7 @@ public function add($auto_date = true, $null_values = false)
                     $field[$this->def['primary']] = (int) $this->id;
 
                     if ($asso !== false && $asso['type'] == 'fk_shop') {
-                        foreach ($shops as $id_shop) {
+                        foreach ($id_shop_list as $id_shop) {
                             $field['id_shop'] = (int) $id_shop;
                             $result &= Db::getInstance()->insert($this->def['table'] . '_lang', $field);
                         }