// Merge -> revision 8014

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 12:00:05 +00:00
parent d1d4d57eca
commit 52d1d13891
137 changed files with 717 additions and 369 deletions
@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */

-if (!defined('_CAN_LOAD_FILES_'))
+if (!defined('_PS_VERSION_'))
 	exit;

 class MailAlerts extends Module
@@ -580,4 +580,4 @@ class MailAlerts extends Module
 			WHERE `id_product_attribute` = '.(int)$params['id_product_attribute'].' 
 			AND `id_product` = '.(int)$params['id_product']);
 	}
-}
+}