field_if_set macro in 6.6

Hi

I’ve recently upgraded a customer’s system from 6.5.2 to 6.6 and when testing the publishing noticed loads of error. When investigating the errora it came down to the field_if_set macro being used on the global template. Now my understanding of this macro is that it only displays the field if it’s been assigned to the content type.

So I had a look in the system velocity file and noticed this:

#macro(field_if_set $before $field $after)##
#if($sys.item.hasProperty($field))##
$before##
#field($field)##
$after##
#else##
#field($field)##
#end##
#end

The above macro will display the field regardless

Before the upgrade the same macro was this:

#macro(field_if_set $before $field $after)##
#if($sys.item.hasProperty($field))##
$before##
#field($field)##
$after##
#else##
#__handlefieldaa($field)##
#end##
#end

What’s the correct fix, remove the else or add the __handlefieldaa macro to the else statement?

Cheers
James

Perhaps it is a “fix” for this issue.