From 55de25f4f274ccbe1a5cbacbd4b8342dddfbb3a9 Mon Sep 17 00:00:00 2001
From: mMarinetti <michael.marinetti@prestashop.com>
Date: Fri, 30 Dec 2011 09:37:20 +0000
Subject: [PATCH] // set installers to 1.5.0.4, for next week release

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11919 b9a71923-0436-4b27-9f14-aed3839534dd
---
 install-dev/index.php               | 2 +-
 install-dev/model.php               | 2 +-
 install-dev/sql/upgrade/1.5.0.4.sql | 2 ++
 install-new/init.php                | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 install-dev/sql/upgrade/1.5.0.4.sql

diff --git a/install-dev/index.php b/install-dev/index.php
index b5c3614a0..46548c4d8 100644
--- a/install-dev/index.php
+++ b/install-dev/index.php
@@ -37,7 +37,7 @@ if (!isset($_SERVER['REQUEST_URI']) || $_SERVER['REQUEST_URI'] == '')
 if ($tmp = strpos($_SERVER['REQUEST_URI'], '?'))
 	$_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 0, $tmp);
 
-define('INSTALL_VERSION', '1.5.0.3');
+define('INSTALL_VERSION', '1.5.0.4');
 define('MINIMUM_VERSION_TO_UPDATE', '0.8.5');
 define('INSTALL_PATH', dirname(__FILE__));
 if (version_compare(phpversion(), '5.0.0', '<'))
diff --git a/install-dev/model.php b/install-dev/model.php
index 6273924ee..cd0eb28c9 100644
--- a/install-dev/model.php
+++ b/install-dev/model.php
@@ -63,7 +63,7 @@ if ($tmp = strpos($_SERVER['REQUEST_URI'], '?'))
 	$_SERVER['REQUEST_URI'] = substr($_SERVER['REQUEST_URI'], 0, $tmp);
 $_SERVER['REQUEST_URI'] = str_replace('//', '/', $_SERVER['REQUEST_URI']);
 
-define('INSTALL_VERSION', '1.5.0.3');
+define('INSTALL_VERSION', '1.5.0.4');
 define('PS_INSTALLATION_IN_PROGRESS', true);
 require_once(INSTALL_PATH.'/classes/ToolsInstall.php');
 define('SETTINGS_FILE', INSTALL_PATH.'/../config/settings.inc.php');
diff --git a/install-dev/sql/upgrade/1.5.0.4.sql b/install-dev/sql/upgrade/1.5.0.4.sql
new file mode 100644
index 000000000..525c317c0
--- /dev/null
+++ b/install-dev/sql/upgrade/1.5.0.4.sql
@@ -0,0 +1,2 @@
+SET NAMES 'utf8';
+
diff --git a/install-new/init.php b/install-new/init.php
index 70ad328b4..501524e45 100644
--- a/install-new/init.php
+++ b/install-new/init.php
@@ -25,7 +25,7 @@
 *  International Registered Trademark & Property of PrestaShop SA
 */
 
-define('_PS_INSTALL_VERSION_', '1.5.0.3');
+define('_PS_INSTALL_VERSION_', '1.5.0.4');
 
 // Generate common constants
 define('PS_INSTALLATION_IN_PROGRESS', true);