Branch: refs/heads/QA_5_0 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 4512ada9eb387ee89c2cdf077c27f8a028662a75 https://github.com/phpmyadmin/phpmyadmin/commit/4512ada9eb387ee89c2cdf077c27... Author: William Desportes <williamdes@wdes.fr> Date: 2020-01-12 (Sun, 01 January 2020) +01:00 Changed paths: M libraries/classes/Database/Designer/Common.php Log Message: ----------- Fix php error when creating a relation between a table and a view in Designer Yes, that does not make sense but it should not throw and error "Uncaught TypeError: mb_strtoupper() expects parameter 1 to be string" Signed-off-by: William Desportes <williamdes@wdes.fr> Commit: f14d675308f604fd3f6f6fecb1b6189b7720ad47 https://github.com/phpmyadmin/phpmyadmin/commit/f14d675308f604fd3f6f6fecb1b6... Author: Jayati Shrivastava <gaurijove@gmail.com> Date: 2020-01-12 (Sun, 01 January 2020) +01:00 Changed paths: M js/functions.js M libraries/classes/Controllers/Table/StructureController.php Log Message: ----------- revert change introduced by pr #15718 and fix #15718 Signed-off-by: Jayati Shrivastava <gaurijove@gmail.com> Commit: e93005fd58285c4455463b28073edab7678c016e https://github.com/phpmyadmin/phpmyadmin/commit/e93005fd58285c4455463b28073e... Author: William Desportes <williamdes@wdes.fr> Date: 2020-01-12 (Sun, 01 January 2020) +01:00 Changed paths: M js/functions.js M libraries/classes/Controllers/Table/StructureController.php Log Message: ----------- Merge #15744, #15743 - Fix - #15717 Pull-request: #15744 Closes: #15743 Fixes: #15717 Signed-off-by: William Desportes <williamdes@wdes.fr>