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

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

Browse Source
This commit is contained in:
Weblate 2014-02-15 15:37:46 +01:00
commit cbc9b2a11b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
- bug #4275 Broken Link to php extension manual
- bug #4053 List of procedures is not displayed after executing with Enter
- bug #4081 Setup page content shifted to the right edge of its tabs
- bug #4284 Reordering a column erases comments for other columns
4.1.7.0 (2014-02-09)
- bug #4245 initial Browse query does not match sorting order

4
libraries/structure.lib.php
View File

@ -2509,8 +2509,8 @@ function PMA_moveColumns($db, $table)
$default_type,
$current_timestamp ? '' : $data['Default'],
isset($data['Extra']) && $data['Extra'] !== '' ? $data['Extra'] : false,
isset($data['Comments']) && $data['Comments'] !== ''
? $data['Comments'] : false,
isset($data['COLUMN_COMMENT']) && $data['COLUMN_COMMENT'] !== ''
? $data['COLUMN_COMMENT'] : false,
$we_dont_change_keys,
$i,
$i === 0 ? '-first' : $column_names[$i - 1]