// MERGE with 1.4 r7770

2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
@@ -24,6 +24,8 @@
 *  @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 */
+
+if(!defined('_PS_MAGIC_QUOTES_GPC_'))
 define('_PS_MAGIC_QUOTES_GPC_', get_magic_quotes_gpc());

 function latin1_database_to_utf8()