diff --git a/modules/mailalerts/config.xml b/modules/mailalerts/config.xml index 8af979fc4..d01df2961 100755 --- a/modules/mailalerts/config.xml +++ b/modules/mailalerts/config.xml @@ -2,7 +2,7 @@ mailalerts - + diff --git a/modules/mailalerts/upgrade/install-2.5.php b/modules/mailalerts/upgrade/install-2.5.php index 8696a4a2b..440e5512a 100644 --- a/modules/mailalerts/upgrade/install-2.5.php +++ b/modules/mailalerts/upgrade/install-2.5.php @@ -6,24 +6,9 @@ if (!defined('_PS_VERSION_')) function upgrade_module_2_5($object) { return Db::getInstance()->execute(' - ALTER TABLE '._DB_PREFIX_.'mailalert_customer_oos - ADD '.mailalerts_stripslashes_field('id_lang').' INT( 10 ) UNSIGNED NOT NULL , + ALTER TABLE `'._DB_PREFIX_.'mailalert_customer_oos` + ADD `id_lang` INT( 10 ) UNSIGNED NOT NULL , DROP PRIMARY KEY , - ADD PRIMARY KEY ( - '.mailalerts_stripslashes_field('id_customer').' , - '.mailalerts_stripslashes_field('customer_email').' , - '.mailalerts_stripslashes_field('id_product').' , - '.mailalerts_stripslashes_field('id_product_attribute').' , - '.mailalerts_stripslashes_field('id_shop').' - )' - ); -} - -function mailalerts_stripslashes_field($field) -{ - $quotes = array('"\\\'"', '"\'"'); - $dquotes = array('\'\\\\"\'', '\'"\''); - $backslashes = array('"\\\\\\\\"', '"\\\\"'); - - return '`'.bqSQL($field).'` = replace(replace(replace(`'.bqSQL($field).'`, '.$quotes[0].', '.$quotes[1].'), '.$dquotes[0].', '.$dquotes[1].'), '.$backslashes[0].', '.$backslashes[1].')'; + ADD PRIMARY KEY (`id_customer` , `customer_email` , `id_product` , `id_product_attribute` , `id_shop`) + '); } \ No newline at end of file