Merge commit 'babad6e'

ChangeLog

@@ -70,6 +70,8 @@ phpMyAdmin - ChangeLog
 - bug       Incorrect text/icon display in Tracking report
 - bug #4404 Recordset return from procedure display nothing
 - bug #4584 Edit dialog for routines is too long for smaller displays
+- bug #4586 Javascript error after moving a column
+- bug #4576 Issue with long comments on table columns
 
 4.2.11.0 (2014-10-31)
 - bug       ReferenceError: Table_onover is not defined

libraries/DisplayResults.class.php

@@ -1810,11 +1810,20 @@ class PMA_DisplayResults
             && isset($comments_map[$fields_meta->table])
             && isset($comments_map[$fields_meta->table][$fields_meta->name])
         ) {
-            $comments = '<span class="tblcomment">'
-                . htmlspecialchars(
-                    $comments_map[$fields_meta->table][$fields_meta->name]
-                )
-                . '</span>';
+            $sanitized_comments = htmlspecialchars(
+                $comments_map[$fields_meta->table][$fields_meta->name]
+            );
+
+            $comments = '<span class="tblcomment" title="'
+                . $sanitized_comments . '">';
+            $limitChars = $GLOBALS['cfg']['LimitChars'];
+            if (/*overload*/mb_strlen($sanitized_comments) > $limitChars) {
+                $sanitized_comments = /*overload*/mb_substr(
+                    $sanitized_comments, 0, $limitChars
+                ) . '…';
+            }
+            $comments .= $sanitized_comments;
+            $comments .= '</span>';
         }
         return $comments;
     } // end of the '_getCommentForRow()' function