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

// better message for Theme edition + french translation

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11982 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2012-01-02 10:56:44 +00:00
parent f1a5aa7720
commit 9ac97aac36
3 changed files with 525 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/shop/Shop.php
+3 -1
View File
@@ -122,7 +122,8 @@ class ShopCore extends ObjectModel
parent::__construct($id, $id_lang, $id_shop);
if ($this->id)
{
$sql = 'SELECT su.physical_uri, su.virtual_uri, su.domain, su.domain_ssl, t.name, t.directory
$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)
LEFT JOIN '._DB_PREFIX_.'theme t ON (t.id_theme = s.id_theme)
@@ -133,6 +134,7 @@ class ShopCore extends ObjectModel
if (!$row = Db::getInstance()->getRow($sql))
return;
$this->theme_id = $row['id_theme'];
$this->theme_name = $row['name'];
$this->theme_directory = $row['directory'];
$this->physical_uri = $row['physical_uri'];