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

Changelog entry for bug #3383711. Some formatting

Browse Source
This commit is contained in:
Madhura Jayaratne
2011-08-04 00:04:16 +05:30
parent 7909da2ea0
commit 68e21b05e4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog
- bug #3375325 [interface] Page list in navigation frame looks odd - bug #3375325 [interface] Page list in navigation frame looks odd
- bug #3313235 [interface] Error div misplaced - bug #3313235 [interface] Error div misplaced
- bug #3374802 [interface] Comment on a column breaks inline editing - bug #3374802 [interface] Comment on a column breaks inline editing
- bug #3383711 [display] Order by a column in a view doesn't work in some cases
3.4.4.0 (not yet released) 3.4.4.0 (not yet released)
- bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes

5
libraries/display_tbl.lib.php
View File

@@ -796,8 +796,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// 2.1.3 Check the field name for a bracket. // 2.1.3 Check the field name for a bracket.
// If it contains one, it's probably a function column // If it contains one, it's probably a function column
// like 'COUNT(`field`)' // like 'COUNT(`field`)'
// This check is not sufficient, see bug #3383711, it still might be a column name of a view, check is_orgname // It still might be a column name of a view. See bug #3383711
if (strpos($name_to_use_in_sort, '(') !== false && !$is_orgname) { // Check is_orgname.
if (strpos($name_to_use_in_sort, '(') !== false && ! $is_orgname) {
$sort_order = ' ORDER BY ' . $name_to_use_in_sort . ' '; $sort_order = ' ORDER BY ' . $name_to_use_in_sort . ' ';
} else { } else {
$sort_order = ' ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' '; $sort_order = ' ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' ';