From 308a3253017d9b911fc64db971602ccf41cff56a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 25 Aug 2013 07:02:29 -0400 Subject: [PATCH] bug #4066 varchar field not truncated in table browse mode --- ChangeLog | 1 + libraries/DisplayResults.class.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a44b4d638e..feb11bd052 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog + Add pmahomme icon credits (FamFamFam silk icon set) - bug #4064 Table structure statistics "Space usage" caption too small for l10n - bug #4051 Wrong tabindex when inserting rows +- bug #4066 varchar field not truncated in table browse mode 4.0.5.0 (2013-08-04) - bug #3977 Not detected configuration storage diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index e31ac6f1b3..4f0d617642 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3865,8 +3865,8 @@ class PMA_DisplayResults // (unless it's a link-type transformation) if (PMA_strlen($column) > $GLOBALS['cfg']['LimitChars'] && ($_SESSION['tmp_user_values']['display_text'] == self::DISPLAY_PARTIAL_TEXT) - && gettype($transformation_plugin) == "object" - && ! strpos($transformation_plugin->getName(), 'Link') === true + && ! (gettype($transformation_plugin) == "object" + && strpos($transformation_plugin->getName(), 'Link') !== false) ) { $column = PMA_substr($column, 0, $GLOBALS['cfg']['LimitChars']) . '...';