From cd1c3b6b28cebcfa67af84963cb2344b28cf495b Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 18 Oct 2013 05:48:33 -0400 Subject: [PATCH] Fix coding style --- libraries/DisplayResults.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 7def1358c1..6c66134520 100644 --- a/libraries/DisplayResults.class.php +++ b/libraries/DisplayResults.class.php @@ -3882,6 +3882,7 @@ class PMA_DisplayResults $is_field_truncated, $analyzed_sql, &$dt_result, $col_index ) { + $limitChars = $GLOBALS['cfg']['LimitChars']; $is_analyse = $this->__get('is_analyse'); $field_flags = $GLOBALS['dbi']->fieldFlags($dt_result, $col_index); if (stristr($field_flags, self::BINARY_FIELD) @@ -3899,7 +3900,7 @@ class PMA_DisplayResults // Cut all fields to $GLOBALS['cfg']['LimitChars'] // (unless it's a link-type transformation) - if ($GLOBALS['PMA_String']->strlen($column) > $GLOBALS['cfg']['LimitChars'] + if ($GLOBALS['PMA_String']->strlen($column) > $limitChars && ($_SESSION['tmpval']['pftext'] == self::DISPLAY_PARTIAL_TEXT) && ! (gettype($transformation_plugin) == "object" && strpos($transformation_plugin->getName(), 'Link') !== false)