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

Merge branch 'smarty_debug' of https://github.com/PrestaEdit/PrestaShop into PrestaEdit-smarty_debug

Browse Source 
Conflicts:
	controllers/admin/AdminPerformanceController.php
	install-dev/data/xml/configuration.xml
This commit is contained in:
gRoussac
2013-08-06 10:42:44 +02:00
parent 77ba55b090
commit a69d1c6d05
5 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/data/xml/configuration.xml
+3
View File
@@ -771,6 +771,9 @@ Country</value>
</configuration>
<configuration id="PS_CUSTOMER_CREATION_EMAIL" name="PS_CUSTOMER_CREATION_EMAIL">
<value>1</value>
</configuration>
<configuration id="PS_SMARTY_CONSOLE_KEY" name="PS_SMARTY_CONSOLE_KEY">
<value>SMARTY_DEBUG</value>
</configuration>
</entities>
</entity_configuration>
install-dev/upgrade/sql/1.5.5.0.sql
+2
View File
@@ -34,3 +34,5 @@ ALTER TABLE `PREFIX_product_shop` DROP INDEX `date_add`, ADD INDEX `date_add` (`
UPDATE `PREFIX_hook` SET `live_edit` = '1' WHERE `name` LIKE 'leftcolumn';
UPDATE `PREFIX_configuration` SET `name` = '0' WHERE `name` LIKE 'PS_LEGACY_IMAGES' AND `value` LIKE '1';
INSERT INTO `PREFIX_configuration` (`name`, `value`, `date_add`, `date_upd`) VALUES('PS_SMARTY_CONSOLE_KEY', 'SMARTY_DEBUG', NOW(), NOW());