Revert followup change for #337585 -- the only thing an empty macro should return is the autogenerated id.

Fix #337585 -- Behavior flags on macros weren't using the site defaults. This most often manifested as missing "nomousezoom".

Fix #582934, patch by me, rerolled by pivica and hutch: PHP 5.3 compatibility for hook_gmap(). (Manual backport)