The branch, QA_3_4 has been updated via a211b8ba0ee947a0aacdf23b7ec72fb038a0c83c (commit) from 63d164ca9945c7f4295706062666e263df8b6c4f (commit) - Log ----------------------------------------------------------------- commit a211b8ba0ee947a0aacdf23b7ec72fb038a0c83c Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: Mon Sep 19 23:17:13 2011 +0530 bug #3411224 [display] Broken binary column when 'Show binary contents' not set ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + libraries/display_tbl.lib.php | 23 ++++++++++++++--------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9be1920..6ba0b67 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - bug #3410604 [config] Configuration storage incorrect suggested table name - bug #3383572 [interface] Cannot execute saved query - bug #3411535 [display] Full text button unchecks results display options +- bug #3411224 [display] Broken binary column when 'Show binary contents' is not set 3.4.5.0 (2011-09-14) - bug #3375325 [interface] Page list in navigation frame looks odd diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index dd0d2e9..d73129f 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1440,6 +1440,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // displays special characters from binaries $field_flags = PMA_DBI_field_flags($dt_result, $i); + $is_html = false; if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) { $row[$i] = PMA_printable_bit_value($row[$i], $meta->length); // some results of PROCEDURE ANALYSE() are reported as @@ -1458,18 +1459,22 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // we show the BINARY message and field's size // (or maybe use a transformation) $row[$i] = PMA_handle_non_printable_contents('BINARY', $row[$i], $transform_function, $transform_options, $default_function, $meta, $_url_params); + $is_html = true; } } - // transform functions may enable no-wrapping: - $function_nowrap = $transform_function . '_nowrap'; - $bool_nowrap = (($default_function != $transform_function && function_exists($function_nowrap)) ? $function_nowrap($transform_options) : false); - - // do not wrap if date field type - $nowrap = ((preg_match('@DATE|TIME@i', $meta->type) || $bool_nowrap) ? ' nowrap' : ''); - $where_comparison = ' = \'' . PMA_sqlAddslashes($row[$i]) . '\''; - $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated); - + if ($is_html) { + $vertical_display['data'][$row_no][$i] = PMA_buildValueDisplay($class, $condition_field, $row[$i]); + } else { + // transform functions may enable no-wrapping: + $function_nowrap = $transform_function . '_nowrap'; + $bool_nowrap = (($default_function != $transform_function && function_exists($function_nowrap)) ? $function_nowrap($transform_options) : false); + + // do not wrap if date field type + $nowrap = ((preg_match('@DATE|TIME@i', $meta->type) || $bool_nowrap) ? ' nowrap' : ''); + $where_comparison = ' = \'' . PMA_sqlAddslashes($row[$i]) . '\''; + $vertical_display['data'][$row_no][$i] = '<td ' . PMA_prepare_row_data($class, $condition_field, $analyzed_sql, $meta, $map, $row[$i], $transform_function, $default_function, $nowrap, $where_comparison, $transform_options, $is_field_truncated); + } } else { $vertical_display['data'][$row_no][$i] = PMA_buildEmptyDisplay($class, $condition_field, $meta); } hooks/post-receive -- phpMyAdmin