[core,legacy] fix @6403aef Fatal error on PHP<5.3
Merge branch 'non_e_modifier' into pilot