From 4e49673feec90b75c3e467ab8bca41792317ea25 Mon Sep 17 00:00:00 2001 From: rMalie Date: Wed, 9 May 2012 15:42:57 +0000 Subject: [PATCH] // Fix notice on shop creation page git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15126 b9a71923-0436-4b27-9f14-aed3839534dd --- controllers/admin/AdminShopController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/admin/AdminShopController.php b/controllers/admin/AdminShopController.php index 7e5076343..2596954a9 100755 --- a/controllers/admin/AdminShopController.php +++ b/controllers/admin/AdminShopController.php @@ -305,7 +305,7 @@ class AdminShopControllerCore extends AdminController $display_group_list = false; } - if (!$display_group_list) + if ($display_group_list) { $options = array(); foreach (ShopGroup::getShopGroups() as $group) @@ -609,7 +609,7 @@ class AdminShopControllerCore extends AdminController FROM '._DB_PREFIX_.'shop_group g LEFT JOIN '._DB_PREFIX_.'shop s ON g.id_shop_group = s.id_shop_group LEFT JOIN '._DB_PREFIX_.'shop_url u ON u.id_shop = s.id_shop - ORDER BY g.name, s.name, u.main, u.domain'; + ORDER BY g.name, s.name, u.domain'; $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql); foreach ($results as $row) {