Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d67066b9ccc7f2be37646a3c87721c6fa0bfddeb https://github.com/phpmyadmin/phpmyadmin/commit/d67066b9ccc7f2be37646a3c8772... Author: Michal Čihař <michal@cihar.com> Date: 2015-12-27 (Sun, 27 Dec 2015) Changed paths: M test/libraries/PMA_js_escape_test.php Log Message: ----------- Add test for PMA_getJsValue with string Issue #11783 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 218f13d8e0de20c1d0f417d1792c8629f8d053e6 https://github.com/phpmyadmin/phpmyadmin/commit/218f13d8e0de20c1d0f417d1792c... Author: Michal Čihař <michal@cihar.com> Date: 2015-12-27 (Sun, 27 Dec 2015) Changed paths: M ChangeLog M js/messages.php Log Message: ----------- Avoid syntax error in javascript messages If max_input_vars is set to invalid value (eg. 1000M), the generated javascript is invalid. We fix this by forcing the value to be integer, what should do the same thing as PHP is doing when parsing this. Fixes #11783 Signed-off-by: Michal Čihař <michal@cihar.com> Commit: 43aa000bdddb1a8065ca12926e678b370a45b093 https://github.com/phpmyadmin/phpmyadmin/commit/43aa000bdddb1a8065ca12926e67... Author: Michal Čihař <michal@cihar.com> Date: 2015-12-27 (Sun, 27 Dec 2015) Changed paths: M ChangeLog M js/messages.php Log Message: ----------- Merge branch 'QA_4_5' Compare: https://github.com/phpmyadmin/phpmyadmin/compare/8358d8c93940...43aa000bdddb