From c19a9c0d319b5e419eedae8c14cc5d488e534f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Fri, 6 Jun 2003 12:36:09 +0000
Subject: [PATCH] $cfg['LimitChars'] now limits all fields (RFE #742123).

---
 ChangeLog                      | 2 ++
 libraries/display_tbl.lib.php3 | 9 ++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 048631965..c363b3d2e 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,8 @@ $Source$
     * libraries/relation_cleanup.lib.php3, mult_submits.inc.php3, sql.php3:
       Cleanup phpMyAdmin tables also after multi submit actions (RFE #749989).
     * tbl_query_box.php3: Don't add target if not in query window.
+    * libraries/display_tbl.lib.php3: $cfg['LimitChars'] now limits all fields
+      (RFE #742123).
 
 2003-06-05 Marc Delisle  <lem9@users.sourceforge.net>
     * Documentation.html: new faq 6.20 about CREATE TEMPORARY TABLES
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 0bf9edd43..7c19cab05 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -1237,12 +1237,11 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                         // loic1: support blanks in the key
                         $relation_id = $row[$pointer];
 
-                        // loic1: Cut text/blob fields even if $cfg['ShowBlob'] is true
-                        if (eregi('BLOB', $meta->type)) {
-                            if (strlen($row[$pointer]) > $GLOBALS['cfg']['LimitChars'] && ($dontlimitchars != 1)) {
-                                $row[$pointer] = substr($row[$pointer], 0, $GLOBALS['cfg']['LimitChars']) . '...';
-                            }
+                        // nijel: Cut all fields to $cfg['LimitChars']
+                        if (strlen($row[$pointer]) > $GLOBALS['cfg']['LimitChars'] && ($dontlimitchars != 1)) {
+                            $row[$pointer] = substr($row[$pointer], 0, $GLOBALS['cfg']['LimitChars']) . '...';
                         }
+
                         // loic1: displays special characters from binaries
                         $field_flags = PMA_mysql_field_flags($dt_result, $i);
                         if (eregi('BINARY', $field_flags)) {