[ticket/11638] Variable names goof...

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
Merge pull request #1630 from brunoais/ticket/11638

[ticket/11638] Variable names goof...