Branch: refs/heads/QA_4_6 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 8fcc943b7e7aa68d621d1c566c1c7239d9c2d579 https://github.com/phpmyadmin/phpmyadmin/commit/8fcc943b7e7aa68d621d1c566c1c... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M ChangeLog M js/config.js
Log Message: ----------- Avoid javascript errors on invalid location hash
Fixes #11948
Signed-off-by: Michal Čihař michal@cihar.com
Commit: e50a445d17525a8f04e57241a58f3517d1abaa86 https://github.com/phpmyadmin/phpmyadmin/commit/e50a445d17525a8f04e57241a58f... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M ChangeLog M libraries/common.inc.php
Log Message: ----------- Define is_ajax_request earlier
This fixes PHP warning on configuration errors.
Fixes #11950
Signed-off-by: Michal Čihař michal@cihar.com
Commit: 1894e33753c7ad61b202d298e56a6f27e07c8ca8 https://github.com/phpmyadmin/phpmyadmin/commit/1894e33753c7ad61b202d298e56a... Author: Michal Čihař michal@cihar.com Date: 2016-02-12 (Fri, 12 Feb 2016)
Changed paths: M ChangeLog M js/config.js M libraries/common.inc.php
Log Message: ----------- Merge branch 'QA_4_5' into QA_4_6
Compare: https://github.com/phpmyadmin/phpmyadmin/compare/5636189d56e9...1894e33753c7