dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Fix request_uri when there is no / at the end of the string #PSFV-606

Browse Source
This commit is contained in:
rMalie
2012-03-14 13:57:45 +00:00
parent b91e211440
commit 56067c92ca
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+9 -1
View File
@@ -1613,9 +1613,17 @@ class ToolsCore
// Rewrite virtual multishop uri // Rewrite virtual multishop uri
if ($uri['virtual']) if ($uri['virtual'])
{ {
fwrite($write_fd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n");
if (!$rewrite_settings) 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"); 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"); fwrite($write_fd, 'RewriteRule ^'.ltrim($uri['virtual'], '/').'(.*) '.$uri['physical']."$1 [L]\n\n");
} }
config/config.inc.php
-3
View File
@@ -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...) */ /* Trying to redefine HTTP_HOST if empty (on some webservers...) */
if (!isset($_SERVER['HTTP_HOST']) || empty($_SERVER['HTTP_HOST'])) if (!isset($_SERVER['HTTP_HOST']) || empty($_SERVER['HTTP_HOST']))
$_SERVER['HTTP_HOST'] = @getenv('HTTP_HOST'); $_SERVER['HTTP_HOST'] = @getenv('HTTP_HOST');