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-10-15 14:40:12 +02:00
commit 6846d58951
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

@ -50,6 +50,7 @@ phpMyAdmin - ChangeLog
+ Support Drizzle database
- bug #3356456 [interface] Interface problems for queries having LIMIT clauses
+ [interface] Remove DefaultPropDisplay feature
- bug #3299486 [prettyprint] Order By in a query containing comment character
3.4.7.0 (not yet released)
- bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false

4
libraries/display_tbl.lib.php
View File

@ -928,9 +928,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// It still might be a column name of a view. See bug #3383711
// Check is_orgname.
if (strpos($name_to_use_in_sort, '(') !== false && ! $is_orgname) {
$sort_order = ' ORDER BY ' . $name_to_use_in_sort . ' ';
$sort_order = "\n" . 'ORDER BY ' . $name_to_use_in_sort . ' ';
} else {
$sort_order = ' ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' ';
$sort_order = "\n" . 'ORDER BY ' . $sort_tbl . PMA_backquote($name_to_use_in_sort) . ' ';
}
unset($name_to_use_in_sort);
unset($is_orgname);