[phpMyAdmin Git] [phpmyadmin/phpmyadmin] 37b22a: Fix #16102 - Broken error message

[Petr Duda]

Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 37b22a5c7166cb023195538e5b7c8b202451107c
https://github.com/phpmyadmin/phpmyadmin/commit/37b22a5c7166cb023195538e5b7c8b202451107c
Author: Petr Duda <petrduda at seznam.cz>
Date: 2020-05-31 (Sun, 05 May 2020) +02:00

Changed paths: 
M libraries/classes/Config/FormDisplay.php
M libraries/classes/Html/MySQLDocumentation.php
M libraries/classes/Sanitize.php

Log Message:
-----------
Fix #16102 - Broken error message

Signed-off-by: Petr Duda <petrduda at seznam.cz>

Commit: 8e74c29baf500a2b61c409ea30ecf45535a39cea
https://github.com/phpmyadmin/phpmyadmin/commit/8e74c29baf500a2b61c409ea30ecf45535a39cea
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-05-31 (Sun, 05 May 2020) +02:00

Changed paths: 
M libraries/classes/Config/FormDisplay.php
M libraries/classes/Html/MySQLDocumentation.php
M libraries/classes/Sanitize.php

Log Message:
-----------
Merge #16153 - Fix #16102 - Broken error message

Pull-request: #16153
Fixes: #16102

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: 87d4a211641da9f22f31d64b188d90f708086290
https://github.com/phpmyadmin/phpmyadmin/commit/87d4a211641da9f22f31d64b188d90f708086290
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-05-31 (Sun, 05 May 2020) +02:00

Changed paths: 
M libraries/classes/Charsets/Collation.php

Log Message:
-----------
Split some code in the Collation class

Signed-off-by: William Desportes <williamdes at wdes.fr>

Commit: b7494aaa627542be1d9bdde305954fedd91e50ef
https://github.com/phpmyadmin/phpmyadmin/commit/b7494aaa627542be1d9bdde305954fedd91e50ef
Author: William Desportes <williamdes at wdes.fr>
Date: 2020-05-31 (Sun, 05 May 2020) +02:00

Changed paths: 
M libraries/classes/Charsets/Collation.php

Log Message:
-----------
Move level 1 into getNameForLevel1

Signed-off-by: William Desportes <williamdes at wdes.fr>