Address Format Broken

I am using OC 1.17 and noticed that my previous fix for displaying the Address Format for a country no longer works.

See:
http://forum.opencart0.com/index.php/to ... ml#msg2723

Using:
firstname lastname
company
address_1
address_2
city, zone postcode
country

No longer works.

Could someone please point me in the right direction?

Thanks,
Tom

You need to do it like this:

{firstname} {lastname}
{company}
{address_1}
{address_2}
{city}, {zone} {postcode}
{country}