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

but #3461750 [edit] Sort by key generates wrong sql with limit clause

Browse Source
This commit is contained in:
Madhura Jayaratne 2011-12-18 10:58:25 +05:30
parent 21bf7ce381
commit d6f12a7044
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -64,6 +64,7 @@ phpMyAdmin - ChangeLog
- bug #3408377 [interface] Deleting table from the DB does not change the table counter
+ rfe #3438266 [designer] Toggle for relation lines
- bug #3442069 [AJAX] database list not updated after adding/deleting a user + database
- but #3461750 [edit] Sort by key generates wrong sql with limit clause
3.4.10.0 (not yet released)
- bug #3460090 [interface] TextareaAutoSelect feature broken

11
libraries/display_tbl.lib.php
View File

@ -551,13 +551,20 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$asc_sort = '`' . implode('` ASC, `', array_keys($index->getColumns())) . '` ASC';
$desc_sort = '`' . implode('` DESC, `', array_keys($index->getColumns())) . '` DESC';
$used_index = $used_index || $local_order == $asc_sort || $local_order == $desc_sort;
if (preg_match('@(.*)([[:space:]](LIMIT (.*)|PROCEDURE (.*)|FOR UPDATE|LOCK IN SHARE MODE))@is', $unsorted_sql_query, $my_reg)) {
$unsorted_sql_query_first_part = $my_reg[1];
$unsorted_sql_query_second_part = $my_reg[2];
} else {
$unsorted_sql_query_first_part = $unsorted_sql_query;
$unsorted_sql_query_second_part = '';
}
echo '<option value="'
. htmlspecialchars($unsorted_sql_query . "\n" . ' ORDER BY ' . $asc_sort)
. htmlspecialchars($unsorted_sql_query_first_part . "\n" . ' ORDER BY ' . $asc_sort . $unsorted_sql_query_second_part)
. '"' . ($local_order == $asc_sort ? ' selected="selected"' : '')
. '>' . htmlspecialchars($index->getName()) . ' ('
. __('Ascending') . ')</option>';
echo '<option value="'
. htmlspecialchars($unsorted_sql_query . "\n" . ' ORDER BY ' . $desc_sort)
. htmlspecialchars($unsorted_sql_query_first_part . "\n" . ' ORDER BY ' . $desc_sort . $unsorted_sql_query_second_part)
. '"' . ($local_order == $desc_sort ? ' selected="selected"' : '')
. '>' . htmlspecialchars($index->getName()) . ' ('
. __('Descending') . ')</option>';