Fix some potential bugs after my last commit

Signed-off-by: William Desportes <williamdes@wdes.fr>
phpmyadmin · May 19, 2020 · cfc17e5 · cfc17e5
1 parent 3db0332
commit cfc17e5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/libraries/classes/Common.php b/libraries/classes/Common.php
@@ -118,7 +118,7 @@ public static function database(): void
         if (isset($_POST['submitcollation'], $_POST['db_collation']) && ! empty($_POST['db_collation'])) {
             [$db_charset] = explode('_', $_POST['db_collation']);
             $sql_query = 'ALTER DATABASE ' . Util::backquote($db)
-                . ' DEFAULT' . Util::getCharsetQueryPart($_POST['db_collation']);
+                . ' DEFAULT' . Util::getCharsetQueryPart($_POST['db_collation'] ?? '');
             $dbi->query($sql_query);
             $message = Message::success();
 
@@ -140,7 +140,7 @@ public static function database(): void
                         . '.'
                         . Util::backquote($tableName)
                         . ' DEFAULT '
-                        . Util::getCharsetQueryPart($_POST['db_collation']);
+                        . Util::getCharsetQueryPart($_POST['db_collation'] ?? '');
                     $dbi->query($sql_query);
 
                     /**

diff --git a/libraries/classes/CreateAddField.php b/libraries/classes/CreateAddField.php
@@ -462,7 +462,7 @@ public function getTableCreationQuery(string $db, string $table): string
             $sqlQuery .= ' ENGINE = ' . $this->dbi->escapeString($_POST['tbl_storage_engine']);
         }
         if (! empty($_POST['tbl_collation'])) {
-            $sqlQuery .= Util::getCharsetQueryPart($_POST['tbl_collation']);
+            $sqlQuery .= Util::getCharsetQueryPart($_POST['tbl_collation'] ?? '');
         }
         if (! empty($_POST['connection'])
             && ! empty($_POST['tbl_storage_engine'])

diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
@@ -102,7 +102,7 @@ public function createDbBeforeCopy()
             . Util::backquote($_POST['newname']);
         if (isset($_POST['db_collation'])) {
             $local_query .= ' DEFAULT'
-                . Util::getCharsetQueryPart($_POST['db_collation']);
+                . Util::getCharsetQueryPart($_POST['db_collation'] ?? '');
         }
         $local_query .= ';';
         $GLOBALS['sql_query'] .= $local_query;
@@ -842,7 +842,7 @@ public function getTableAltersArray(
             && $_POST['tbl_collation'] !== $tbl_collation
         ) {
             $table_alters[] = 'DEFAULT '
-                . Util::getCharsetQueryPart($_POST['tbl_collation']);
+                . Util::getCharsetQueryPart($_POST['tbl_collation'] ?? '');
         }
 
         if ($pma_table->isEngine(['MYISAM', 'ARIA', 'ISAM'])