From 3d038ced197d5f1849d0412f2928f9d69ff8af66 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 14 Nov 2014 11:23:46 -0500
Subject: [PATCH 1/2] 4.3.0-alpha1

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 README                     | 2 +-
 doc/conf.py                | 2 +-
 libraries/Config.class.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README b/README
index 7a05f035c4..f37f8e2334 100644
--- a/README
+++ b/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.
 
diff --git a/doc/conf.py b/doc/conf.py
index 9cb7f81f86..7b9a2adc95 100644
--- a/doc/conf.py
+++ b/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
 
diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 4ac49d1333..b9c071c03b 100644
--- a/libraries/Config.class.php
+++ b/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
          */

From e1a722dee799f5013cdff90c611d65a4ac760cca Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 16 Nov 2014 06:48:17 -0500
Subject: [PATCH 2/2] bug #4576 Issue with long comments on table columns

Signed-off-by: Marc Delisle <marc@infomarc.info>
---
 ChangeLog                          |  1 +
 libraries/DisplayResults.class.php | 19 ++++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 777bd9ac93..0597bff33e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog
 - 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
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 212d85be86..62ba14468a 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1808,11 +1808,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 ($GLOBALS['PMA_String']->strlen($sanitized_comments) > $limitChars) {
+                $sanitized_comments = $GLOBALS['PMA_String']->substr(
+                    $sanitized_comments, 0, $limitChars
+                ) . '…';
+            }
+            $comments .= $sanitized_comments;
+            $comments .= '</span>';
         }
         return $comments;
     } // end of the '_getCommentForRow()' function