dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix notice on shop creation page

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15126 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-05-09 15:42:57 +00:00
parent 8da5be371f
commit 4e49673fee
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminShopController.php
+2 -2
View File
@@ -305,7 +305,7 @@ class AdminShopControllerCore extends AdminController
$display_group_list = false; $display_group_list = false;
} }
if (!$display_group_list) if ($display_group_list)
{ {
$options = array(); $options = array();
foreach (ShopGroup::getShopGroups() as $group) foreach (ShopGroup::getShopGroups() as $group)
@@ -609,7 +609,7 @@ class AdminShopControllerCore extends AdminController
FROM '._DB_PREFIX_.'shop_group g 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 s ON g.id_shop_group = s.id_shop_group
LEFT JOIN '._DB_PREFIX_.'shop_url u ON u.id_shop = s.id_shop 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); $results = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
foreach ($results as $row) foreach ($results as $row)
{ {