diff options
Diffstat (limited to 'libraries/pmd_common.php')
| -rw-r--r-- | libraries/pmd_common.php | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php index ba54a4c3b3..a3bc492f3b 100644 --- a/libraries/pmd_common.php +++ b/libraries/pmd_common.php @@ -55,7 +55,7 @@ function PMA_getTablesInfo() $one_table['TABLE_NAME'], ENT_QUOTES ); - $GLOBALS['PMD']['TABLE_TYPE'][$i] = $GLOBALS['PMA_String']->strtoupper( + $GLOBALS['PMD']['TABLE_TYPE'][$i] = /*overload*/mb_strtoupper( $one_table['ENGINE'] ); @@ -471,13 +471,10 @@ function PMA_saveDisplayField($db, $table, $field) */ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - $tables = $GLOBALS['dbi']->getTablesFull($db, $T1); - $type_T1 = $pmaString->strtoupper($tables[$T1]['ENGINE']); + $type_T1 = /*overload*/mb_strtoupper($tables[$T1]['ENGINE']); $tables = $GLOBALS['dbi']->getTablesFull($db, $T2); - $type_T2 = $pmaString->strtoupper($tables[$T2]['ENGINE']); + $type_T2 = /*overload*/mb_strtoupper($tables[$T2]['ENGINE']); // native foreign key if (PMA_Util::isForeignKeySupported($type_T1) @@ -594,16 +591,13 @@ function PMA_addNewRelation($db, $T1, $F1, $T2, $F2, $on_delete, $on_update) */ function PMA_removeRelation($T1, $F1, $T2, $F2) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - list($DB1, $T1) = explode(".", $T1); list($DB2, $T2) = explode(".", $T2); $tables = $GLOBALS['dbi']->getTablesFull($DB1, $T1); - $type_T1 = $pmaString->strtoupper($tables[$T1]['ENGINE']); + $type_T1 = /*overload*/mb_strtoupper($tables[$T1]['ENGINE']); $tables = $GLOBALS['dbi']->getTablesFull($DB2, $T2); - $type_T2 = $pmaString->strtoupper($tables[$T2]['ENGINE']); + $type_T2 = /*overload*/mb_strtoupper($tables[$T2]['ENGINE']); $try_to_delete_internal_relation = false; |