From 2bc0b80cb939e7710ee40927468067dfce92d92e Mon Sep 17 00:00:00 2001 From: William Desportes Date: Sun, 31 Jan 2021 01:23:46 +0100 Subject: [PATCH] Fix a phpdoc block and a coding standard issue Signed-off-by: William Desportes --- libraries/classes/Config/FormDisplayTemplate.php | 2 +- libraries/classes/Query/Generator.php | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/libraries/classes/Config/FormDisplayTemplate.php b/libraries/classes/Config/FormDisplayTemplate.php index f5c3c5502f..49afce963b 100644 --- a/libraries/classes/Config/FormDisplayTemplate.php +++ b/libraries/classes/Config/FormDisplayTemplate.php @@ -18,10 +18,10 @@ use function defined; use function htmlspecialchars; use function htmlspecialchars_decode; use function implode; -use function is_array; use function is_bool; use function mb_strtolower; use function sprintf; +use function is_string; /** * PhpMyAdmin\Config\FormDisplayTemplate class diff --git a/libraries/classes/Query/Generator.php b/libraries/classes/Query/Generator.php index c47dfa1c14..95619169f1 100644 --- a/libraries/classes/Query/Generator.php +++ b/libraries/classes/Query/Generator.php @@ -129,11 +129,6 @@ class Generator /** * Returns SQL query for fetching columns for a table * - * The 'Key' column is not calculated properly, use $dbi->getColumns() - * to get correct values. - * - * @see getColumns() - * * @param string $database name of database * @param string $table name of table to retrieve columns from * @param string|null $escapedColumn name of column, null to show all columns @@ -147,7 +142,7 @@ class Generator ): string { return 'SHOW ' . ($full ? 'FULL' : '') . ' COLUMNS FROM ' . Util::backquote($database) . '.' . Util::backquote($table) - . ($escapedColumn !== null ? "LIKE '" + . ($escapedColumn !== null ? " LIKE '" . $escapedColumn . "'" : ''); }