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

// Context part 2

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7598 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2011-07-12 12:50:00 +00:00
parent 39d0acc30b
commit 25b1bceffd
21 changed files with 221 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/AddressFormat.php
+5 -5
View File
@@ -235,10 +235,10 @@ class AddressFormatCore extends ObjectModel
* @addressFormat is the format
* @return double Array
*/
public static function getFormattedAddressFieldsValues($address, $addressFormat)
public static function getFormattedAddressFieldsValues($address, $addressFormat, $context = null)
{
global $cookie;
if (!$context)
$context = Context::getContext();
$tab = array();
$temporyObject = array();
@@ -268,8 +268,8 @@ class AddressFormatCore extends ObjectModel
$temporyObject[$associateName[0]] = new $associateName[0]($address->{$idFieldName});
if ($temporyObject[$associateName[0]])
$tab[$pattern] = (is_array($temporyObject[$associateName[0]]->{$associateName[1]})) ?
((isset($temporyObject[$associateName[0]]->{$associateName[1]}[(isset($cookie) ? $cookie->id_lang : Configuration::get('PS_LANG_DEFAULT'))])) ?
$temporyObject[$associateName[0]]->{$associateName[1]}[(isset($cookie) ? $cookie->id_lang : Configuration::get('PS_LANG_DEFAULT'))] : '') :
((isset($temporyObject[$associateName[0]]->{$associateName[1]}[$context->language->id])) ?
$temporyObject[$associateName[0]]->{$associateName[1]}[$context->language->id] : '') :
$temporyObject[$associateName[0]]->{$associateName[1]};
}
}