From e9854a8a0e0b6dcfa8ec9c7b08e91d101acee36f Mon Sep 17 00:00:00 2001 From: dMetzger Date: Tue, 21 Aug 2012 14:24:43 +0000 Subject: [PATCH] // Removed FO call to shop->name instead of PS_SHOP_NAME git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16936 b9a71923-0436-4b27-9f14-aed3839534dd --- classes/controller/AdminController.php | 13 ------------- classes/pdf/HTMLTemplate.php | 5 +---- classes/pdf/HTMLTemplateSupplyOrderForm.php | 4 +--- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/classes/controller/AdminController.php b/classes/controller/AdminController.php index 404c7ccfa..fafcb5276 100644 --- a/classes/controller/AdminController.php +++ b/classes/controller/AdminController.php @@ -1321,19 +1321,6 @@ class AdminControllerCore extends Controller 'controller_name' => htmlentities(Tools::getValue('controller')), '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, - )); - } } /** diff --git a/classes/pdf/HTMLTemplate.php b/classes/pdf/HTMLTemplate.php index 0b0c3746d..b447d3e8b 100755 --- a/classes/pdf/HTMLTemplate.php +++ b/classes/pdf/HTMLTemplate.php @@ -43,10 +43,7 @@ abstract class HTMLTemplateCore */ public function getHeader() { - $shop_name = ''; - if (Validate::isLoadedObject($this->shop)) - $shop_name = $this->shop->name; - + $shop_name = Configuration::get('PS_SHOP_NAME'); $path_logo = $this->getLogo(); $width = 0; diff --git a/classes/pdf/HTMLTemplateSupplyOrderForm.php b/classes/pdf/HTMLTemplateSupplyOrderForm.php index b18b67aad..fb53a38b1 100644 --- a/classes/pdf/HTMLTemplateSupplyOrderForm.php +++ b/classes/pdf/HTMLTemplateSupplyOrderForm.php @@ -122,9 +122,7 @@ class HTMLTemplateSupplyOrderFormCore extends HTMLTemplate */ public function getHeader() { - $shop_name = ''; - if (Validate::isLoadedObject($this->shop)) - $shop_name = $this->shop->name; + $shop_name = Configuration::get('PS_SHOP_NAME'); $this->smarty->assign(array( 'logo_path' => $this->getLogo(),