Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 2f04cdaa7ac9d6b961ac0b4036e06435e735492c https://github.com/phpmyadmin/phpmyadmin/commit/2f04cdaa7ac9d6b961ac0b4036e0... Author: Michal Čihař michal@cihar.com Date: 2017-08-29 (Tue, 29 Aug 2017)

Changed paths: M libraries/SysInfo.php M libraries/server_status_monitor.lib.php

Log Message: ----------- Properly escape javascript variables

In case some variable name contains special chars, we should really escape it.

Issue #13444

Signed-off-by: Michal Čihař michal@cihar.com

Commit: 7d0f3d926d6a8fb81b1b1fea0ebce1a2872d191c https://github.com/phpmyadmin/phpmyadmin/commit/7d0f3d926d6a8fb81b1b1fea0ebc... Author: Michal Čihař michal@cihar.com Date: 2017-08-29 (Tue, 29 Aug 2017)

Changed paths: M libraries/server_status_monitor.lib.php

Log Message: ----------- Merge branch 'QA_4_7'

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/71a993c6c2d9...7d0f3d926d6a