gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_7'

Browse Source
This commit is contained in:
Michal Čihař 2018-01-16 16:02:38 +01:00
commit 89d40d5e8d
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -48,6 +48,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

8
libraries/classes/Sql.php
View File

@ -628,6 +628,8 @@ EOT;
|| $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] == '*')))
@ -1639,7 +1641,11 @@ EOT;
if ($result !== false && $num_rows > 0) {
$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);
}
$displayResultsObject->setProperties(
$num_rows,