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*(.*)#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) {