Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: bed84bbf58969724f76e03a078ed6e18eca00f5d https://github.com/phpmyadmin/phpmyadmin/commit/bed84bbf58969724f76e03a078ed... Author: William Desportes williamdes@wdes.fr Date: 2019-12-17 (Tue, 12 December 2019) +01:00

Changed paths: M libraries/classes/Twig/MessageExtension.php

Log Message: ----------- Add type-hints to prevent a type error

Uncaught TypeError: Argument 1 passed to PhpMyAdmin\Message::notice() must be of the type string, object given

This error only occurs because of 4bb10d2ed35f3e71f7798a98100fae9107385378 that changed filter to apply

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 1cb0ec7286aacbbd1428404c257d4b4bf451ff41 https://github.com/phpmyadmin/phpmyadmin/commit/1cb0ec7286aacbbd1428404c257d... Author: William Desportes williamdes@wdes.fr Date: 2019-12-17 (Tue, 12 December 2019) +01:00

Changed paths: M libraries/classes/Twig/MessageExtension.php

Log Message: ----------- Merge branch 'QA_5_0'

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 0ea7dd6660ff6e96036e0ef8428f33b667d49d6c https://github.com/phpmyadmin/phpmyadmin/commit/0ea7dd6660ff6e96036e0ef8428f... Author: William Desportes williamdes@wdes.fr Date: 2019-12-17 (Tue, 12 December 2019) +01:00

Changed paths: M templates/display/change_password/file_b.twig

Log Message: ----------- Use apply tag instead of filter

This commit fixes new changes since b475cfdd6c5176399020a3139bc6ad900b36da58

Signed-off-by: William Desportes williamdes@wdes.fr

Commit: 643eb0f54483c030fae621442cfc434746b89b54 https://github.com/phpmyadmin/phpmyadmin/commit/643eb0f54483c030fae621442cfc... Author: William Desportes williamdes@wdes.fr Date: 2019-12-17 (Tue, 12 December 2019) +01:00

Changed paths: M templates/display/change_password/file_b.twig M templates/display/change_password/file_d.twig

Log Message: ----------- Fix raw html displayed in password change hashing dropdowns

Signed-off-by: William Desportes williamdes@wdes.fr