[*] CORE : Manual merge of https://github.com/PrestaShop/PrestaShop/ thanks @kpodemski

2013-10-29 19:05:21 +01:00
parent 6d5ca9969e
commit c98b5e0c78
5 changed files with 28 additions and 0 deletions
@@ -365,6 +365,7 @@ CREATE TABLE `PREFIX_cms` (
  `id_cms_category` int(10) unsigned NOT NULL,
  `position` int(10) unsigned NOT NULL DEFAULT '0',
  `active` tinyint(1) unsigned NOT NULL default '0',
+  `indexation` tinyint(1) unsigned NOT NULL default '1',
  PRIMARY KEY (`id_cms`)
 ) ENGINE=ENGINE_TYPE DEFAULT CHARSET=utf8;

@@ -1,3 +1,5 @@
 ALTER TABLE `PREFIX_customer_message` CHANGE `ip_address` `ip_address` VARCHAR( 15 ) NULL DEFAULT NULL;

 UPDATE `PREFIX_orders` SET conversion_rate = 1 WHERE conversion_rate = 0;
+
+ALTER TABLE `PREFIX_cms` ADD `indexation` tinyint(1) UNSIGNED NULL DEFAULT '1' AFTER `active`;