improve code readability [FIX] also merges r27191 from 5.x
improve code readability
[FIX] also merges r27191 from 5.x

git-svn-id: a7fabbc6a7c54ea5c67cbd16bd322330fd10cc35@27192 b456876b-0849-0410-b77d-98878d47e9d5

oregional/tiki,changi67/tiki,tikiorg/tiki,changi67/tiki,changi67/tiki,tikiorg/tiki,oregional/tiki,oregional/tiki,tikiorg/tiki,tikiorg/tiki,oregional/tiki,changi67/tiki,changi67/tiki