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

// Fixed #PSTEST-804

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13699 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2012-02-28 15:35:37 +00:00
parent 472215d425
commit 63281c1f61
3 changed files with 49 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/Shop.php
+1 -2
View File
@@ -94,7 +94,6 @@ class ShopCore extends ObjectModel
'store' => array('type' => 'shop'),
'webservice_account' => array('type' => 'shop'),
'warehouse' => array('type' => 'shop'),
/* 'stock_available' => array('type' => 'fk_shop', 'primary' => 'id_stock_available'), */
);
protected $webserviceParameters = array(
@@ -127,7 +126,7 @@ class ShopCore extends ObjectModel
parent::__construct($id, $id_lang, $id_shop);
if ($this->id)
{
$sql = 'SELECT su.physical_uri, su.virtual_uri,
$sql = 'SELECT su.physical_uri, su.virtual_uri,
su.domain, su.domain_ssl, t.id_theme, t.name, t.directory
FROM '._DB_PREFIX_.'shop s
LEFT JOIN '._DB_PREFIX_.'shop_url su ON (s.id_shop = su.id_shop)