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

bug #1729027 Sorting results of VIEW browsing

Browse Source
This commit is contained in:
Marc Delisle
2007-06-22 19:17:56 +00:00
parent a7097ea4a1
commit 0c03c102b0
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -72,6 +72,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
- bug #1734285 Copy database with VIEWs - bug #1734285 Copy database with VIEWs
- bug #1722502 DROP TABLE in export VIEW - bug #1722502 DROP TABLE in export VIEW
- bug #1729027 Sorting results of VIEW browsing
2.10.2.0 (2007-06-15) 2.10.2.0 (2007-06-15)

7
libraries/display_tbl.lib.php
View File

@@ -169,12 +169,15 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
// false // false
if ($do_display['nav_bar'] == '1' || $do_display['sort_lnk'] == '1') { if ($do_display['nav_bar'] == '1' || $do_display['sort_lnk'] == '1') {
if (isset($unlim_num_rows) && $unlim_num_rows < 2) { // - Do not display sort links if less than 2 rows.
// - For a VIEW we (probably) did not count the number of rows
// so don't test this number here, it would remove the possibility
// of sorting VIEW results.
if (isset($unlim_num_rows) && $unlim_num_rows < 2 && ! PMA_Table::isView($db, $table)) {
// garvin: force display of navbar for vertical/horizontal display-choice. // garvin: force display of navbar for vertical/horizontal display-choice.
// $do_display['nav_bar'] = (string) '0'; // $do_display['nav_bar'] = (string) '0';
$do_display['sort_lnk'] = (string) '0'; $do_display['sort_lnk'] = (string) '0';
} }
} // end if (3) } // end if (3)
// 5. Updates the synthetic var // 5. Updates the synthetic var