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

// PrestaShop normalisation

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13868 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
nPellicari
2012-03-06 09:09:47 +00:00
parent c8f09a7148
commit 7f0df4f1c7
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/controller/FrontController.php
+6 -6
View File
@@ -339,7 +339,7 @@ class FrontControllerCore extends Controller
'customerName' => ($this->context->customer->logged ? $this->context->cookie->customer_firstname.' '.$this->context->cookie->customer_lastname : false) 'customerName' => ($this->context->customer->logged ? $this->context->cookie->customer_firstname.' '.$this->context->cookie->customer_lastname : false)
)); ));
$assignArray = array( $assign_array = array(
'img_ps_dir' => _PS_IMG_, 'img_ps_dir' => _PS_IMG_,
'img_cat_dir' => _THEME_CAT_DIR_, 'img_cat_dir' => _THEME_CAT_DIR_,
'img_lang_dir' => _THEME_LANG_DIR_, 'img_lang_dir' => _THEME_LANG_DIR_,
@@ -357,13 +357,13 @@ class FrontControllerCore extends Controller
// Add the images directory for mobile // Add the images directory for mobile
if ($this->context->getMobileDevice() != false) if ($this->context->getMobileDevice() != false)
$assignArray['img_mobile_dir'] = _THEME_MOBILE_IMG_DIR_; $assign_array['img_mobile_dir'] = _THEME_MOBILE_IMG_DIR_;
foreach ($assignArray as $assignKey => $assignValue) foreach ($assign_array as $assign_key => $assign_value)
if (substr($assignValue, 0, 1) == '/' || $protocol_content == 'https://') if (substr($assign_value, 0, 1) == '/' || $protocol_content == 'https://')
$this->context->smarty->assign($assignKey, $protocol_content.Tools::getMediaServer($assignValue).$assignValue); $this->context->smarty->assign($assign_key, $protocol_content.Tools::getMediaServer($assign_value).$assign_value);
else else
$this->context->smarty->assign($assignKey, $assignValue); $this->context->smarty->assign($assign_key, $assign_value);
/* /*
* These shortcuts are DEPRECATED as of version 1.5. * These shortcuts are DEPRECATED as of version 1.5.