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

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

Browse Source
This commit is contained in:
Rémi Gaillard committed 2013-10-11 14:11:28 +02:00
2 parents 1316bd7e1f 7a5187e84e
commit 6b52ada195
1 file changed
+3 -3
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStatsController.php
+3 -3
View File
@@ -85,8 +85,8 @@ class AdminStatsControllerCore extends AdminStatsTabController
return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue(' return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue('
SELECT COUNT(*) SELECT COUNT(*)
FROM `'._DB_PREFIX_.'module` m 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() public static function getModulesToUpdate()
@@ -613,4 +613,4 @@ class AdminStatsControllerCore extends AdminStatsTabController
} }
die(Tools::jsonEncode(array('has_errors' => true))); die(Tools::jsonEncode(array('has_errors' => true)));
} }
} }