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

// Fix multi virtual uri on same domain for htaccess + products on multishop

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8196 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-08-25 15:27:49 +00:00
parent 4c421016ed
commit 2c60ea0863
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+1 -1
View File
@@ -1437,7 +1437,7 @@ class ProductCore extends ObjectModel
FROM `'._DB_PREFIX_.'product` p FROM `'._DB_PREFIX_.'product` p
'.$context->shop->sqlAsso('product', 'p').' '.$context->shop->sqlAsso('product', 'p').'
WHERE p.`active` = 1 WHERE p.`active` = 1
AND p.`id_product` IN ('.implode(', ', $ids_product).') '.(($ids_product) ? 'AND p.`id_product` IN ('.implode(', ', $ids_product).')' : '').'
AND p.`id_product` IN ( AND p.`id_product` IN (
SELECT cp.`id_product` SELECT cp.`id_product`
FROM `'._DB_PREFIX_.'category_group` cg FROM `'._DB_PREFIX_.'category_group` cg
classes/Tools.php
+11 -9
View File
@@ -1588,6 +1588,9 @@ class ToolsCore
$domains = array(); $domains = array();
foreach (ShopUrl::getShopUrls() as $shopUrl) foreach (ShopUrl::getShopUrls() as $shopUrl)
{ {
if (!isset($domains[$shopUrl['domain']]))
$domains[$shopUrl['domain']] = array();
$domains[$shopUrl['domain']] = array( $domains[$shopUrl['domain']] = array(
'physical' => $shopUrl['physical_uri'], 'physical' => $shopUrl['physical_uri'],
'virtual' => $shopUrl['virtual_uri'], 'virtual' => $shopUrl['virtual_uri'],
@@ -1607,15 +1610,14 @@ class ToolsCore
fwrite($writeFd, "\n# Disable Multiviews\nOptions -Multiviews\n\n"); fwrite($writeFd, "\n# Disable Multiviews\nOptions -Multiviews\n\n");
fwrite($writeFd, "RewriteEngine on\n\n"); fwrite($writeFd, "RewriteEngine on\n\n");
foreach ($domains as $domain => $uri) foreach ($domains as $domain => $list_uri)
{ foreach ($list_uri as $uri)
// Rewrite virtual multishop uri // Rewrite virtual multishop uri
if ($uri['virtual']) if ($uri['virtual'])
{ {
fwrite($writeFd, 'RewriteCond %{HTTP_HOST} ^'.$domain.'$'."\n"); 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 // Webservice
fwrite($writeFd, 'RewriteRule ^api/?(.*)$ '."webservice/dispatcher.php?url=$1 [QSA,L]\n\n"); fwrite($writeFd, 'RewriteRule ^api/?(.*)$ '."webservice/dispatcher.php?url=$1 [QSA,L]\n\n");