From 86fcd351be0fbba5b65f677d9706b82a009735e6 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Wed, 14 Mar 2012 13:57:45 +0000
Subject: [PATCH] // Fix request_uri when there is no / at the end of the
 string #PSFV-606

---
 classes/Tools.php     | 10 +++++++++-
 config/config.inc.php |  3 ---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index 1efc0e4a7..7f73fecd5 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1613,9 +1613,17 @@ class ToolsCore
 				// Rewrite virtual multishop uri
 				if ($uri['virtual'])
 				{
-					fwrite($write_fd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n");
 					if (!$rewrite_settings)
+					{
+						fwrite($write_fd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n");
 						fwrite($write_fd, 'RewriteRule ^'.trim($uri['virtual'], '/').'/?$ '.$uri['physical'].$uri['virtual']."index.php [L,R]\n");
+					}
+					else
+					{
+						fwrite($write_fd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n");
+						fwrite($write_fd, 'RewriteRule ^'.trim($uri['virtual'], '/').'$ '.$uri['physical'].$uri['virtual']." [L,R]\n");
+					}
+					fwrite($write_fd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n");
 					fwrite($write_fd, 'RewriteRule ^'.ltrim($uri['virtual'], '/').'(.*) '.$uri['physical']."$1 [L]\n\n");
 				}
 
diff --git a/config/config.inc.php b/config/config.inc.php
index bf14dc505..ad9bc4d7c 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -82,9 +82,6 @@ if (!isset($_SERVER['REQUEST_URI']) || empty($_SERVER['REQUEST_URI']))
 	}
 }
 
-if (substr($_SERVER['REQUEST_URI'], -1) != '/')
-	$_SERVER['REQUEST_URI'] .= '/';
-
 /* Trying to redefine HTTP_HOST if empty (on some webservers...) */
 if (!isset($_SERVER['HTTP_HOST']) || empty($_SERVER['HTTP_HOST']))
 	$_SERVER['HTTP_HOST'] = @getenv('HTTP_HOST');