The branch, master has been updated via 9d32b987e64cfcf539d1f88c87f84cfa37b477d8 (commit) via 653cd113cd25693547b8493caf53089fbfd9a649 (commit) from 09605e2d816117abe4da3cf47336bd692abb1726 (commit)

- Log ----------------------------------------------------------------- commit 9d32b987e64cfcf539d1f88c87f84cfa37b477d8 Merge: 653cd113cd25693547b8493caf53089fbfd9a649 09605e2d816117abe4da3cf47336bd692abb1726 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Mar 12 18:54:07 2011 +0530

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 653cd113cd25693547b8493caf53089fbfd9a649 Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat Mar 12 18:52:14 2011 +0530

For binary fields remove only the 'inline_edit' class.

-----------------------------------------------------------------------

Summary of changes: libraries/display_tbl.lib.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index d47e94d..ca8ef62 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1325,9 +1325,8 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // TEXT fields type so we have to ensure it's really a BLOB $field_flags = PMA_DBI_field_flags($dt_result, $i);

- // reset $class from $inline_edit_class to just 'data' - // as we can't edit binary data - $class = 'data'; + // remove 'inline_edit' from $class as we can't edit binary data. + $class = str_replace('inline_edit', '', $class);

if (stristr($field_flags, 'BINARY')) { if (!isset($row[$i]) || is_null($row[$i])) {

hooks/post-receive