Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

2013-10-11 14:11:28 +02:00
parent 1316bd7e1f 7a5187e84e
commit 6b52ada195
1 changed files with 3 additions and 3 deletions
@@ -85,8 +85,8 @@ class AdminStatsControllerCore extends AdminStatsTabController
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
 		SELECT COUNT(*)
 		FROM `'._DB_PREFIX_.'module` m
-		'.Shop::addSqlAssociation('module', 'm', true, 'module_shop.active=1')
-		);
+		'.Shop::addSqlAssociation('module', 'm', true).'
+		WHERE m.active = 1');
 	}
 	
 	public static function getModulesToUpdate()
@@ -613,4 +613,4 @@ class AdminStatsControllerCore extends AdminStatsTabController
 		}
 		die(Tools::jsonEncode(array('has_errors' => true)));
 	}
-}
+}