From c5beb6b4e0997be29b5458369465a14c3ea399e9 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Thu, 23 Feb 2012 13:00:45 +0000
Subject: [PATCH] // Fix display of some tables in install/dev

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13552 b9a71923-0436-4b27-9f14-aed3839534dd
---
 install-dev/classes/xmlLoader.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/install-dev/classes/xmlLoader.php b/install-dev/classes/xmlLoader.php
index f23ec6610..9c6d7dc25 100644
--- a/install-dev/classes/xmlLoader.php
+++ b/install-dev/classes/xmlLoader.php
@@ -1,6 +1,6 @@
 <?php
 /*
-* 2007-2012 PrestaShop
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -660,8 +660,11 @@ class InstallXmlLoader
 			foreach (Db::getInstance()->executeS($sql) as $row)
 			{
 				$table = current($row);
-				if (preg_match('#^'._DB_PREFIX_.'(.+?)(_lang)?$#i', $table, $m) && !preg_match('#(_group_shop|_shop)$#i', $table))
-					$tables[$m[1]] = (isset($m[2]) && $m[2]) ? true : false;
+				if (preg_match('#^'._DB_PREFIX_.'(.+?)(_lang)?$#i', $table, $m))
+					if (preg_match('#^'._DB_PREFIX_.'(.+?)(_group_shop|_shop)$#i', $table, $m2) && !isset($tables[$m2[1]]))
+						$tables[$m[1]] = (isset($m[2]) && $m[2]) ? true : false;
+					else
+						$tables[$m[1]] = (isset($m[2]) && $m[2]) ? true : false;
 			}
 		}