// 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

@@ -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,
-			));
-		}
 	}
 
 	/**

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;

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(),