Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 06fe8c0e25b107e75ce54e33a8b5f3f4b1afac34 https://github.com/phpmyadmin/phpmyadmin/commit/06fe8c0e25b107e75ce54e33a8b5... Author: Michal Čihař michal@cihar.com Date: 2017-03-22 (Wed, 22 Mar 2017)

Changed paths: M libraries/common.inc.php

Log Message: ----------- Properly report invalid token error on AJAX requests

We need to keep ajax_request flag to properly report result in JSON.

Issue #13114

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

Commit: 82d18f622918e79f9834e2440c1d3abd0f7ed399 https://github.com/phpmyadmin/phpmyadmin/commit/82d18f622918e79f9834e2440c1d... Author: Michal Čihař michal@cihar.com Date: 2017-03-22 (Wed, 22 Mar 2017)

Changed paths: M libraries/common.inc.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/e9b317161334...82d18f622918