From 25290cc6be1451144a646c1e05e7c831d1ca4319 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 7 Feb 2020 17:01:40 +0100 Subject: [PATCH 1/2] Fix #15899 - Uncaught TypeError: mb_strtoupper - Relation view of a view Fixes: #15899 Signed-off-by: William Desportes --- tbl_relation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_relation.php b/tbl_relation.php index 89da4964a5..398818e381 100644 --- a/tbl_relation.php +++ b/tbl_relation.php @@ -45,7 +45,7 @@ $options_array = [ $relation = $containerBuilder->get('relation'); $cfgRelation = $relation->getRelationsParam(); $tbl_storage_engine = mb_strtoupper( - $dbi->getTable($db, $table)->getStatusInfo('Engine') + $dbi->getTable($db, $table)->getStatusInfo('Engine') ?? '' ); $upd_query = new Table($table, $db, $dbi); From df55e04c55eb6458d2e2d6f7659d0897a70584a2 Mon Sep 17 00:00:00 2001 From: William Desportes Date: Fri, 7 Feb 2020 17:02:50 +0100 Subject: [PATCH 2/2] Add ChangeLog entry for #15899 Signed-off-by: William Desportes --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index acebe2ec05..c8126fd8e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -32,6 +32,7 @@ phpMyAdmin - ChangeLog - issue #15836 Fixed "has no type" error on export and import pages for "Chinese traditional" users - issue #15863 Fixed designer move menu icon not changing directions and tables menu list resize button - issue #15854 Fixed black borders for full screen mode on Designer +- issue #15899 Fix "Uncaught TypeError: mb_strtoupper()" on the relational view of a view 5.0.1 (2020-01-07) - issue #15719 Fixed error 500 when browsing a table when $cfg['LimitChars'] used a string and not an int value