diff --git a/ChangeLog b/ChangeLog index 3e20ed00de..b6bff6cb01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ phpMyAdmin - ChangeLog - issue #11389 ReCaptcha produces deprecated messages under PHP 7 - issue #11387 phpseclib < 2.0 produces deprecated messages on PHP 7 - issue #11404 "Switch to copied table" doesn't work +- issue #11406 Missing quotes after calling "distinct values" 4.4.13.1 (2015-08-08) - issue #11368 SQL error when importing phpMyAdmin dump file diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index c043658a64..db5e64853c 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3161,7 +3161,9 @@ class PMA_DisplayResults $display_params = $this->__get('display_params'); - if ($meta->numeric == 1) { + // in some situations (issue 11406), numeric returns 1 + // even for a string type + if ($meta->numeric == 1 && $meta->type != 'string') { // n u m e r i c $display_params['data'][$row_no][$i] @@ -3728,7 +3730,7 @@ class PMA_DisplayResults /** * Prepare data cell for numeric type fields * - * @param string $column the relevant column in data row + * @param string $column the column's value * @param string $class the html class for column * @param boolean $condition_field the column should highlighted * or not