From 4ef752efb37b2de3ba2349590201d55533ad074b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 16 Jan 2018 16:00:43 +0100 Subject: [PATCH] Fixed error handling in PHP 7.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #13938 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/sql.lib.php | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8dab5d9f44..3463cc969b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog 4.7.8 (not yet released) - issue #13914 Fixed resetting default setting values. - issue #13758 Fixed fallback value for collation connection. +- issue #13938 Fixed error handling in PHP 7.2 4.7.7 (2017-12-23) - issue #13865 Fixed displaying of formatted numeric values for some locales diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php index 4d89034819..0fc80695d6 100644 --- a/libraries/sql.lib.php +++ b/libraries/sql.lib.php @@ -611,6 +611,8 @@ function PMA_isRememberSortingOrder($analyzed_sql_results) || $analyzed_sql_results['is_func'] || $analyzed_sql_results['is_analyse']) && $analyzed_sql_results['select_from'] + && isset($analyzed_sql_results['select_expr']) + && isset($analyzed_sql_results['select_tables']) && ((empty($analyzed_sql_results['select_expr'])) || ((count($analyzed_sql_results['select_expr']) == 1) && ($analyzed_sql_results['select_expr'][0] == '*'))) @@ -1662,7 +1664,11 @@ function PMA_getHtmlForSqlQueryResultsTable($displayResultsObject, } else { if (isset($result) && $result !== false) { $fields_meta = $GLOBALS['dbi']->getFieldsMeta($result); - $fields_cnt = count($fields_meta); + if (! is_array($fields_meta)) { + $fields_cnt = 0; + } else { + $fields_cnt = count($fields_meta); + } } $_SESSION['is_multi_query'] = false; $displayResultsObject->setProperties(