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

patch #2550286 [display] Sort arrows problem

Browse Source
This commit is contained in:
Marc Delisle
2009-03-17 15:54:15 +00:00
parent 12853ec30b
commit fa173b7cb0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -43,6 +43,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
+ rfe #1694104 Allow logging of user status with Apache. + rfe #1694104 Allow logging of user status with Apache.
- patch #2649087 None default is different than other None in some languages. - patch #2649087 None default is different than other None in some languages.
+ [lang] Chinese Simplified update, thanks to Shanyan Baishui - rimyxp + [lang] Chinese Simplified update, thanks to Shanyan Baishui - rimyxp
- patch #2550286 [display] Sort arrows problem, thanks to Virsacer - virsacer
3.1.4.0 (not yet released) 3.1.4.0 (not yet released)
+ patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,

5
libraries/display_tbl.lib.php
View File

@@ -747,7 +747,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// the orgname member does not exist for all MySQL versions // the orgname member does not exist for all MySQL versions
// but if found, it's the one on which to sort // but if found, it's the one on which to sort
$name_to_use_in_sort = $fields_meta[$i]->name; $name_to_use_in_sort = $fields_meta[$i]->name;
if (isset($fields_meta[$i]->orgname)) { if (isset($fields_meta[$i]->orgname) && strlen($fields_meta[$i]->orgname)) {
$name_to_use_in_sort = $fields_meta[$i]->orgname; $name_to_use_in_sort = $fields_meta[$i]->orgname;
} }
// $name_to_use_in_sort might contain a space due to // $name_to_use_in_sort might contain a space due to
@@ -764,6 +764,9 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
// for the sort expression (avoids problems with queries // for the sort expression (avoids problems with queries
// like "SELECT id, count(id)..." and clicking to sort // like "SELECT id, count(id)..." and clicking to sort
// on id or on count(id)) // on id or on count(id))
if (strpos($sort_expression_nodirection, $sort_tbl) === false) {
$sort_expression_nodirection = $sort_tbl . $sort_expression_nodirection;
}
$is_in_sort = (str_replace('`', '', $sort_tbl) . $name_to_use_in_sort == str_replace('`', '', $sort_expression_nodirection) ? true : false); $is_in_sort = (str_replace('`', '', $sort_tbl) . $name_to_use_in_sort == str_replace('`', '', $sort_expression_nodirection) ? true : false);
} }
// 2.1.3 Check the field name for a bracket. // 2.1.3 Check the field name for a bracket.