[REF]Manually refactored to match indenting in the equivalent file in branch/12.x
[FIX]Manually merged changes present in branch/12.x.

git-svn-id: file:///var/local/code.tiki.org/tikisvn/trunk@48867 b456876b-0849-0410-b77d-98878d47e9d5