Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 48b4ff8247372b61f0fcc2e0b069aa54873e2086 https://github.com/phpmyadmin/phpmyadmin/commit/48b4ff8247372b61f0fcc2e0b069... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-01-22 (Sat, 01 January 2022) -03:00

Changed paths: M ChangeLog M libraries/classes/Config.php

Log Message: ----------- Fix hide_connection_errors being undefined when a controluser is set

Fixes #17307 Closes #17304

(cherry picked from commit fd692ca382841bfaa6bc58e4dd78d2820d89faa7)

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev

Commit: 9fe9fe8ad181a77b40ec9dccc885d421f7d299d1 https://github.com/phpmyadmin/phpmyadmin/commit/9fe9fe8ad181a77b40ec9dccc885... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-01-22 (Sat, 01 January 2022) -03:00

Changed paths: M ChangeLog M libraries/classes/Config.php

Log Message: ----------- Merge branch 'QA_5_1' into QA_5_2

Commit: 9554df8f2c080435fa9e4ab54d6ca22d8fa5e1fb https://github.com/phpmyadmin/phpmyadmin/commit/9554df8f2c080435fa9e4ab54d6c... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-01-22 (Sat, 01 January 2022) -03:00

Changed paths: M ChangeLog M libraries/classes/Config.php

Log Message: ----------- Merge branch 'QA_5_2'

Commit: 60cdd5013dad332dd045fca629bddf129d5c42bd https://github.com/phpmyadmin/phpmyadmin/commit/60cdd5013dad332dd045fca629bd... Author: Maurício Meneghini Fauth mauricio@fauth.dev Date: 2022-01-22 (Sat, 01 January 2022) -03:00

Changed paths: M themes/bootstrap/theme.json M themes/metro/theme.json M themes/original/theme.json M themes/pmahomme/theme.json

Log Message: ----------- Fix themes version support for phpMyAdmin 5.3

Signed-off-by: Maurício Meneghini Fauth mauricio@fauth.dev