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

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

Browse Source 
Conflicts:
	admin-dev/themes/default/css/modules.css
	admin-dev/themes/default/template/controllers/carts/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/groups/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/products/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/products/images.tpl
	admin-dev/themes/default/template/controllers/products/prices.tpl
	admin-dev/themes/default/template/helpers/form/form.tpl
	admin-dev/themes/default/template/helpers/list/list_header.tpl
	classes/Autoload.php
	classes/Carrier.php
	classes/Product.php
	classes/ProductSale.php
	classes/Tools.php
	classes/Validate.php
	classes/tax/TaxRulesTaxManager.php
	controllers/admin/AdminPPreferencesController.php
	controllers/admin/AdminPerformanceController.php
	install-dev/install_version.php
	js/admin_carrier_wizard.js
	modules/blockcategories/blockcategories.php
	modules/blocklayered/blocklayered.php
	modules/statsequipment/statsequipment.php
	modules/statsproduct/statsproduct.php
	modules/watermark/watermark.php
	themes/default/address.tpl
	themes/default/authentication.tpl
	themes/default/category.tpl
	themes/default/contact-form.tpl
	themes/default/css/history.css
	themes/default/header.tpl
	themes/default/js/cart-summary.js
	themes/default/js/product.js
	themes/default/mobile/order-detail.tpl
	themes/default/modules/blocksearch/blocksearch.tpl
	themes/default/modules/productcomments/productcomments.tpl
	themes/default/order-carrier.tpl
	themes/default/order-detail.tpl
	themes/default/order-opc-new-account.tpl
	themes/default/product.tpl
This commit is contained in:
Kevin Granger
2013-11-21 17:43:51 +01:00
parent 6431f559d7 d6e52bdecb
commit 9eefcfd058
167 changed files with 7261 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/profiling/Controller.php
+10 -5
View File
@@ -176,7 +176,6 @@ abstract class Controller extends ControllerCore
public function __construct()
{
parent::__construct();
// error management
set_error_handler('developpementErrorHandler');
@@ -469,13 +468,19 @@ abstract class Controller extends ControllerCore
echo '<br /><b>Useless GROUP BY need to be removed</b>';
}
}
echo '</div>
<div class="rte" style="text-align:left;padding:8px">
<h3><a name="doubles">Doubles (IDs replaced by "XX") (total = '.count(Db::getInstance()->uniqQueries).')</a></h3>';
$queries = Db::getInstance()->uniqQueries;
arsort($queries);
$count = count(Db::getInstance()->uniqQueries);
foreach ($queries as $q => &$nb)
if ($nb == 1)
$count--;
if ($count)
echo '</div>
<div class="rte" style="text-align:left;padding:8px">
<h3><a name="doubles">Doubles (IDs replaced by "XX") (total = '.$count.')</a></h3>';
foreach ($queries as $q => $nb)
echo $hr.'<b '.$this->getQueryColor($nb).'>'.$nb.'</b> '.$q;
if($nb > 1)
echo $hr.'<b '.$this->getQueryColor($nb).'>'.$nb.'</b> '.$q;
echo '</div>
<div class="rte" style="text-align:left;padding:8px">
<h3><a name="tables">Tables stress</a></h3>';