diff --git a/ChangeLog b/ChangeLog index 6f56742cd8..6fbdb2bfde 100644 --- a/ChangeLog +++ b/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 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 */ diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php index 759e1b8f7e..49aa2fd6bb 100644 --- a/libraries/DisplayResults.class.php +++ b/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 = '' - . htmlspecialchars( - $comments_map[$fields_meta->table][$fields_meta->name] - ) - . ''; + $sanitized_comments = htmlspecialchars( + $comments_map[$fields_meta->table][$fields_meta->name] + ); + + $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 .= ''; } return $comments; } // end of the '_getCommentForRow()' function