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

// Normalize

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12682 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2012-01-25 14:45:32 +00:00
parent 589ab416da
commit 6e008f47d9
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplate.php
+2 -2
View File
@@ -89,7 +89,7 @@ abstract class HTMLTemplateCore
{
$shop_address_obj = $this->shop->getAddress();
if (isset($shop_address_obj) && $shop_address_obj instanceof Address)
$shop_address = AddressFormat::generateAddress($shop_address_obj, array(), ' - ', ' ');return $shop_address;
$shop_address = AddressFormat::generateAddress($shop_address_obj, array(), ' - ', ' ');
return $shop_address;
}
@@ -163,7 +163,7 @@ abstract class HTMLTemplateCore
if (@!include(_PS_THEME_DIR_.'pdf/lang/'.$iso.'.php'))
die('Cannot include PDF translation language file : '._PS_THEME_DIR_.'pdf/lang/'.$iso.'.php');
if (!isset($_LANGPDF) OR !is_array($_LANGPDF))
if (!isset($_LANGPDF) || !is_array($_LANGPDF))
return str_replace('"', '"', $string);
$key = md5(str_replace('\'', '\\\'', $string));
$str = (key_exists('PDF'.$key, $_LANGPDF) ? $_LANGPDF['PDF'.$key] : $string);