The branch, master has been updated via 95e6e0b447333b888c7836d6e6cb773e3d73b092 (commit) via a211b8ba0ee947a0aacdf23b7ec72fb038a0c83c (commit) from 5cae0941647ea53b870d320052d5e76ae85913c5 (commit) - Log ----------------------------------------------------------------- commit 95e6e0b447333b888c7836d6e6cb773e3d73b092 Merge: 5cae094 a211b8b Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: Mon Sep 19 23:28:24 2011 +0530 Merge branch 'QA_3_4' Conflicts: libraries/display_tbl.lib.php ----------------------------------------------------------------------- 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 8d2e08d..99e2dc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,6 +58,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 dc9d817..43367bd 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1645,6 +1645,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 @@ -1663,18 +1664,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