10 Sep
2011
10 Sep
'11
8:24 a.m.
The branch, QA_3_4 has been updated
via 5a82da9ad352dede10c4b78cafb055a246e7af5f (commit)
via 4232fcd458b70913a08240897cde0073c6e78959 (commit)
from 7e7e55b953b63b1f44bc64f636b564a5c754fcda (commit)
- Log -----------------------------------------------------------------
commit 5a82da9ad352dede10c4b78cafb055a246e7af5f
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Sat Sep 10 10:49:44 2011 +0530
Coding style
commit 4232fcd458b70913a08240897cde0073c6e78959
Author: Madhura Jayaratne <madhura.cj(a)gmail.com>
Date: Sat Sep 10 10:47:37 2011 +0530
bug #3403165 [interface] Collation not displayed for long enum fields
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
tbl_structure.php | 6 +++++-
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7566511..9949461 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ phpMyAdmin - ChangeLog
3.4.6.0 (not yet released)
- patch #3404173 InnoDB comment display with tooltips/aliases
- bug #3404886 [navi] Edit SQL statement after error
+- bug #3403165 [interface] Collation not displayed for long enum fields
3.4.5.0 (not yet released)
- bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/tbl_structure.php b/tbl_structure.php
index 4c0b185..246bd0e 100644
--- a/tbl_structure.php
+++ b/tbl_structure.php
@@ -245,6 +245,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$type = $row['Type'];
$extracted_fieldspec = PMA_extractFieldSpec($row['Type']);
+ $truncated = false;
if ('set' == $extracted_fieldspec['type'] || 'enum' ==
$extracted_fieldspec['type']) {
$type = $extracted_fieldspec['type'] . '(' .
str_replace("','", "', '",
$extracted_fieldspec['spec_in_brackets']) . ')';
@@ -252,6 +253,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
// for the case ENUM('–','“')
$type = htmlspecialchars($type);
if(strlen($type) > $GLOBALS['cfg']['LimitChars']) {
+ $truncated = true;
$type = '<abbr title="' . $type . '">' .
substr($type, 0, $GLOBALS['cfg']['LimitChars']) .
'</abbr>';
}
@@ -292,7 +294,9 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
|| substr($type, 0, 8) == 'longtext'
|| substr($type, 0, 3) == 'set'
|| substr($type, 0, 4) == 'enum'
- ) && !$binary) {
+ || ($truncated && substr($type, 13, 4) == 'enum'))
+ && !$binary
+ ) {
if (strpos($type, ' character set ')) {
$type = substr($type, 0, strpos($type, ' character set '));
}
hooks/post-receive
--
phpMyAdmin