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

// Removed FO call to shop->name instead of PS_SHOP_NAME

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16936 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-08-21 14:24:43 +00:00
parent 88da6433b6
commit e9854a8a0e
3 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/AdminController.php
-13
View File
@@ -1321,19 +1321,6 @@ class AdminControllerCore extends Controller
'controller_name' => htmlentities(Tools::getValue('controller')), 'controller_name' => htmlentities(Tools::getValue('controller')),
'currentIndex' => self::$currentIndex 'currentIndex' => self::$currentIndex
)); ));
// Shop context
if ($is_multishop)
{
if (Shop::getContext() == Shop::CONTEXT_SHOP)
$shop_name = $this->context->shop->name;
else
$shop_name = 'PrestaShop';
$this->context->smarty->assign(array(
'shop_name' => $shop_name,
));
}
} }
/** /**
classes/pdf/HTMLTemplate.php
+1 -4
View File
@@ -43,10 +43,7 @@ abstract class HTMLTemplateCore
*/ */
public function getHeader() public function getHeader()
{ {
$shop_name = ''; $shop_name = Configuration::get('PS_SHOP_NAME');
if (Validate::isLoadedObject($this->shop))
$shop_name = $this->shop->name;
$path_logo = $this->getLogo(); $path_logo = $this->getLogo();
$width = 0; $width = 0;
classes/pdf/HTMLTemplateSupplyOrderForm.php
+1 -3
View File
@@ -122,9 +122,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate
*/ */
public function getHeader() public function getHeader()
{ {
$shop_name = ''; $shop_name = Configuration::get('PS_SHOP_NAME');
if (Validate::isLoadedObject($this->shop))
$shop_name = $this->shop->name;
$this->smarty->assign(array( $this->smarty->assign(array(
'logo_path' => $this->getLogo(), 'logo_path' => $this->getLogo(),