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

// Fix & - theme is not w3c valid anymore for now

Browse Source
This commit is contained in:
rMalie
2011-09-14 09:23:32 +00:00
parent 7884bceeeb
commit dfdd99da40
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Dispatcher.php
+2 -2
View File
@@ -325,7 +325,7 @@ class DispatcherCore
if (!isset($this->routes[$route_id]))
{
$query = http_build_query($params);
return ($route_id == 'index') ? 'index.php'.(($query) ? '?'.$query : '') : 'index.php?controller='.$route_id.(($query) ? '&'.$query : '');
return ($route_id == 'index') ? 'index.php'.(($query) ? '?'.$query : '') : 'index.php?controller='.$route_id.(($query) ? '&'.$query : '');
}
$route = $this->routes[$route_id];
@@ -360,7 +360,7 @@ class DispatcherCore
}
// Build a classic url index.php?controller=foo&...
else
$url = 'index.php?controller='.$route['controller'].(($query_params) ? '&'.http_build_query($query_params) : '');
$url = 'index.php?controller='.$route['controller'].(($query_params) ? '&'.http_build_query($query_params) : '');
return $url;
}
classes/FrontController.php
+1 -1
View File
@@ -383,7 +383,7 @@ class FrontControllerCore
{
// $_SERVER['HTTP_HOST'] must be replaced by the real canonical domain
$canonicalURL = str_replace('&', '&', $this->context->link->getPageLink($this->php_self, $this->ssl, $this->context->language->id));
$canonicalURL = $this->context->link->getPageLink($this->php_self, $this->ssl, $this->context->language->id);
if (!Tools::getValue('ajax') && !preg_match('/^'.Tools::pRegexp($canonicalURL, '/').'([&?].*)?$/', (($this->ssl AND Configuration::get('PS_SSL_ENABLED')) ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']))
{
header('HTTP/1.0 301 Moved');