Looks like may have had some changes in the previous file that were not followed through completely. After following the bouncing ball, the issue appears to be in includes/functions/functions_customers.php in the zen_address_format function.
Lines 86 and 87 are affected, so from ZC 1.5.6/a change:
Code:
[FONT=Verdana,Arial,Tahoma,Calibri,Geneva,sans-serif] if (ACCOUNT_COMPANY == 'true' && !empty($adress['company']) && false === strpos($fmt, '$company')) {
$address_out = $address['company'] . $address['cr'] . $address_out;
to:
Code:
[FONT=Verdana,Arial,Tahoma,Calibri,Geneva,sans-serif] if (ACCOUNT_COMPANY == 'true' && !empty($address['$company']) && false === strpos($fmt, '$company')) {
$address_out = $address['$company'] . $address['$cr'] . $address_out;
Captured in pull request #2114: [FONT=Verdana,Arial,Tahoma,Calibri,Geneva,sans-serif]https://github.com/zencart/zencart/pull/2114/files[/FONT][/FONT]
[/FONT]
Bookmarks