Merge remote-tracking branch 'origin/QA_4_3' into QA_4_3

ChangeLog

@@ -68,6 +68,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

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.3.0-dev
+Version 4.3.0-alpha1
 
 A set of PHP-scripts to manage MySQL over the web.
 

doc/conf.py

@@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.3.0-dev'
+version = '4.3.0-alpha1'
 # The full version, including alpha/beta/rc tags.
 release = version
 

libraries/Config.class.php

@@ -114,7 +114,7 @@ class PMA_Config
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.3.0-dev');
+        $this->set('PMA_VERSION', '4.3.0-alpha1');
         /**
          * @deprecated
          */

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