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

sorting on column header

Browse Source
This commit is contained in:
Marc Delisle
2006-08-16 17:39:15 +00:00
parent 0eae2f35a7
commit d6d0a7ce6b
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -5,6 +5,9 @@ phpMyAdmin - ChangeLog
$Id$
$Source$
2006-08-16 Marc Delisle <lem9@users.sourceforge.net>
* libraries/sqlparser.lib.php: sorting on column header
2006-08-16 Michal Čihař <michal@cihar.com>
* libraries/export/htmlexcel.php: Fix charset header of exported HTML/XLS
file (bug #1541100).

7
libraries/sqlparser.lib.php
View File

@@ -1512,7 +1512,12 @@ if ( ! defined( 'PMA_MINIMUM_COMMON' ) ) {
$group_by_clause .= $arr[$i]['data'] . $sep;
}
if ($in_order_by && $upper_data != 'ORDER' && $upper_data != 'BY') {
$order_by_clause .= $arr[$i]['data'] . $sep;
// add a space only before ASC or DESC
// not around the dot between dbname and tablename
if ($arr[$i]['type'] == 'alpha_reservedWord') {
$order_by_clause .= $sep;
}
$order_by_clause .= $arr[$i]['data'];
}
if ($in_having && $upper_data != 'HAVING') {
$having_clause .= $arr[$i]['data'] . $sep;