Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2674e503f2761cdee895b8f0e28841e67faefbc4 https://github.com/phpmyadmin/phpmyadmin/commit/2674e503f2761cdee895b8f0e288... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M libraries/Template.php Log Message: ----------- Assign helperFunctions before doing extract This way we avoid possiblity of rewriting it from within the context. Signed-off-by: Michal Čihař <michal@cihar.com> Commit: beb243949e01462a636f38e5c903b7497c5a6bc0 https://github.com/phpmyadmin/phpmyadmin/commit/beb243949e01462a636f38e5c903... Author: Michal Čihař <michal@cihar.com> Date: 2016-06-20 (Mon, 20 Jun 2016) Changed paths: M libraries/Template.php Log Message: ----------- Merge branch 'QA_4_6' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/221c5f9246a9...beb243949e01