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

// Fix PSCFV-3830

Browse Source
This commit is contained in:
rGaillard
2012-08-31 13:47:10 +00:00
parent a52ab4211f
commit e7c331f34d
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/pdf/HTMLTemplate.php
+3 -6
View File
@@ -49,7 +49,7 @@ abstract class HTMLTemplateCore
$width = 0; $width = 0;
$height = 0; $height = 0;
if (!empty($path_logo)) if (!empty($path_logo))
list($width, $height) = getimagesize(_PS_ROOT_DIR_.'/'.$path_logo); list($width, $height) = getimagesize($path_logo);
$this->smarty->assign(array( $this->smarty->assign(array(
'logo_path' => $path_logo, 'logo_path' => $path_logo,
@@ -109,15 +109,12 @@ abstract class HTMLTemplateCore
{ {
$logo = ''; $logo = '';
// TCPDF check if the document root is present in the image path, if not it will add it.
// In our case, _PS_ROOT_DIR_ could be different from document_root if we use symlinks, that's why
// we don't use _PS_ROOT_DIR_ and we let TCPDF add the document root.
$physical_uri = Context::getContext()->shop->physical_uri.'img/'; $physical_uri = Context::getContext()->shop->physical_uri.'img/';
if (Configuration::get('PS_LOGO_INVOICE') != false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE'))) if (Configuration::get('PS_LOGO_INVOICE') != false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE')))
$logo = $physical_uri.Configuration::get('PS_LOGO_INVOICE'); $logo = _PS_IMG_DIR_.Configuration::get('PS_LOGO_INVOICE');
elseif (Configuration::get('PS_LOGO') != false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO'))) elseif (Configuration::get('PS_LOGO') != false && file_exists(_PS_IMG_DIR_.Configuration::get('PS_LOGO')))
$logo = $physical_uri.Configuration::get('PS_LOGO'); $logo = _PS_IMG_DIR_.Configuration::get('PS_LOGO');
return $logo; return $logo;
} }