gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-09-10 08:40:19 +02:00
commit 76217f845e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

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

21
tbl_structure.php
View File

@ -260,20 +260,23 @@ foreach ($fields as $row) {
// for the case ENUM('–','“')
$type = htmlspecialchars($type);
// in case it is too long
$start = 0;
if (strlen($type) > $GLOBALS['cfg']['LimitChars']) {
$start = 13;
$type = '<abbr title="' . $type . '">' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . '</abbr>';
}
unset($field_charset);
if ((substr($type, 0, 4) == 'char'
|| substr($type, 0, 7) == 'varchar'
|| substr($type, 0, 4) == 'text'
|| substr($type, 0, 8) == 'tinytext'
|| substr($type, 0, 10) == 'mediumtext'
|| substr($type, 0, 8) == 'longtext'
|| substr($type, 0, 3) == 'set'
|| substr($type, 0, 4) == 'enum'
) && !$extracted_fieldspec['binary']) {
if ((substr($type, $start, 4) == 'char'
|| substr($type, $start, 7) == 'varchar'
|| substr($type, $start, 4) == 'text'
|| substr($type, $start, 8) == 'tinytext'
|| substr($type, $start, 10) == 'mediumtext'
|| substr($type, $start, 8) == 'longtext'
|| substr($type, $start, 3) == 'set'
|| substr($type, $start, 4) == 'enum')
&& !$extracted_fieldspec['binary']
) {
if (strpos($type, ' character set ')) {
$type = substr($type, 0, strpos($type, ' character set '));
}