From f4a3e88283637649530452d39a5e2f80f99c1f17 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Wed, 10 Aug 2011 08:08:32 +0000
Subject: [PATCH] // Fix virtual uri rewrite in htaccess + keep old specific
 code in htaccess

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7980 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Tools.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/classes/Tools.php b/classes/Tools.php
index e27fdb7ae..35765517e 100644
--- a/classes/Tools.php
+++ b/classes/Tools.php
@@ -1546,7 +1546,13 @@ class ToolsCore
 				$specificAfter = $m[2];
 			}
 			else
-				$specificBefore = $content;
+			{
+				// For retrocompatibility
+				if (preg_match('#\# http://www\.prestashop\.com - http://www\.prestashop\.com/forums\s*(.*)<IfModule mod_rewrite\.c>#si', $content, $m))
+					$specificBefore = $m[1];
+				else
+					$specificBefore = $content;
+			}
 		}
 
 		// Write .htaccess data
@@ -1582,12 +1588,12 @@ class ToolsCore
 			if ($uri['virtual'])
 			{
 				fwrite($writeFd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n");
-				fwrite($writeFd, "RewriteRule ^".ltrim($uri['virtual'], '/')."/(.*) ".$uri['physical']."/$1 [L]\n\n");
+				fwrite($writeFd, "RewriteRule ^".ltrim($uri['virtual'], '/')."(.*) ".$uri['physical']."/$1 [L]\n\n");
 			}
 		}
 		
 		// Webservice
-		fwrite($writeFd, 'RewriteRule ^api/?(.*)$ '.$uri['physical']."webservice/dispatcher.php?url=$1 [QSA,L]\n\n");
+		fwrite($writeFd, 'RewriteRule ^api/?(.*)$ '."webservice/dispatcher.php?url=$1 [QSA,L]\n\n");
 
 		if ($rewrite_settings)
 		{