From 8982d4985de9638deb0d45517edff560ed009e30 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Tue, 3 Jan 2012 15:28:30 +0000
Subject: [PATCH] // Fix shop URL in new installer

---
 install-new/init.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-new/init.php b/install-new/init.php
index 3560d5454..c75399a9f 100644
--- a/install-new/init.php
+++ b/install-new/init.php
@@ -36,7 +36,7 @@ define('_PS_INSTALL_MODELS_PATH_', _PS_INSTALL_PATH_.'models/');
 define('_PS_INSTALL_LANGS_PATH_', _PS_INSTALL_PATH_.'langs/');
 define('_PS_INSTALL_FIXTURES_PATH_', _PS_INSTALL_PATH_.'fixtures/');
 
-define('__PS_BASE_URI__', dirname(substr($_SERVER['REQUEST_URI'], 0, strrpos($_SERVER['REQUEST_URI'], DIRECTORY_SEPARATOR))).'/');
+define('__PS_BASE_URI__', str_replace('//', '/', '/'.trim(str_replace('\\', '/', preg_replace('#(/|\\\)(install(-dev|-new)?)$#', '/', dirname($_SERVER['REQUEST_URI']))), '/').'/'));
 define('_THEME_NAME_', 'prestashop');
 require_once dirname(_PS_INSTALL_PATH_).'/config/defines.inc.php';
 require_once dirname(_PS_INSTALL_PATH_).'/config/defines_uri.inc.php';