Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: e472b8bbc47b4b9e3390b7d7428f3c6af3804239 https://github.com/phpmyadmin/phpmyadmin/commit/e472b8bbc47b4b9e3390b7d7428f... Author: Simon Vikstrom pullreq@devsn.se Date: 2020-03-06 (Fri, 03 March 2020) +01:00

Changed paths: M libraries/classes/Navigation/NavigationTree.php

Log Message: ----------- Fix "Uncaught TypeError: urlencode() expects parameter 1 to be string, int given in"

If a user creates two tables prefixed with number__... like 2020__abc 2020__cde

then phpmyadmin will group then, the key will end up being an integer instead of a string and PHP will error out on it.

Signed-off-by: Simon Vikstrom pullreq@devsn.se

Commit: fa7e63328bed2a14dda60c58c15f199a194b1fa3 https://github.com/phpmyadmin/phpmyadmin/commit/fa7e63328bed2a14dda60c58c15f... Author: William Desportes williamdes@wdes.fr Date: 2020-03-06 (Fri, 03 March 2020) +01:00

Changed paths: M libraries/classes/Navigation/NavigationTree.php

Log Message: ----------- Merge #16015 - Fix error in NavigationTree where $key might be sent as an int instead of a str to urlencode

Pull-request: #16015

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

Commit: a6e0d7f453eb78483ad3f23ec8b089bb8eae794b https://github.com/phpmyadmin/phpmyadmin/commit/a6e0d7f453eb78483ad3f23ec8b0... Author: William Desportes williamdes@wdes.fr Date: 2020-03-06 (Fri, 03 March 2020) +01:00

Changed paths: M ChangeLog

Log Message: ----------- Add ChangeLog entry for pull-request #16015 (fa7e63328b)

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

Commit: 18b7622b6f5d447448f7d7acb621deb5fcd152ad https://github.com/phpmyadmin/phpmyadmin/commit/18b7622b6f5d447448f7d7acb621... Author: William Desportes williamdes@wdes.fr Date: 2020-03-06 (Fri, 03 March 2020) +01:00

Changed paths: M ChangeLog M libraries/classes/Navigation/NavigationTree.php

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

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