From 3eb23085037e628e79f73b007b6fa15ce85dbae8 Mon Sep 17 00:00:00 2001 From: rMalie Date: Mon, 21 May 2012 19:12:35 +0000 Subject: [PATCH] // Fix multishop in objectModel (langs were not correctly generated when an employee has not all auths on shops) --- classes/ObjectModel.php | 4 +++- classes/shop/Shop.php | 9 +++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 95e870819..447b9c667 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -473,7 +473,9 @@ abstract class ObjectModelCore if (!empty($this->def['multilang'])) { $fields = $this->getFieldsLang(); - $shops = Shop::getShops(true, null, true); + + // @todo : try to do something better than this + $shops = Shop::getCompleteListOfShopsID(); if ($fields && is_array($fields)) foreach ($fields as $field) { diff --git a/classes/shop/Shop.php b/classes/shop/Shop.php index fa7dccbc2..7ca0f450f 100644 --- a/classes/shop/Shop.php +++ b/classes/shop/Shop.php @@ -497,6 +497,15 @@ class ShopCore extends ObjectModel } } + public static function getCompleteListOfShopsID() + { + $list = array(); + $sql = 'SELECT id_shop FROM '._DB_PREFIX_.'shop'; + foreach (Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql) as $row) + $list[] = $row['id_shop']; + return $list; + } + /** * Get shops list *