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

2002-06-20 Robin Johnson <robbat2@users.sourceforge.net>

Browse Source 
* tbl_qbe.php3: Using * for tables fields disables
      sorting for that field (Fix for bug #570698)
This commit is contained in:
Robin Johnson
2002-06-21 03:51:53 +00:00
parent d0cabee45b
commit 76ea7f8211
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-06-20 Robin Johnson <robbat2@users.sourceforge.net>
* tbl_qbe.php3: Using * for tables fields disables
sorting for that field (Fix for bug #570698)
2002-06-20 Marc Delisle <lem9@users.sourceforge.net> 2002-06-20 Marc Delisle <lem9@users.sourceforge.net>
* ChangeLog_till_2.2.6.gz removed from the distribution and copied * ChangeLog_till_2.2.6.gz removed from the distribution and copied
to home page to home page

17
tbl_qbe.php3
View File

@@ -258,6 +258,14 @@ for ($x = 0; $x < $col; $x++) {
<option value=""></option> <option value=""></option>
<?php <?php
echo "\n"; echo "\n";
// if they have chosen all fields using the * selector,
// then sorting is not available
// Robbat2 - Fix for Bug #570698
if (isset($Sort[$x]) && isset($Field[$x]) && (substr(urldecode($Field[$x]),-2) == '.*')) {
$Sort[$x] = '';
} //end if
if (isset($Sort[$x]) && $Sort[$x] == 'ASC') { if (isset($Sort[$x]) && $Sort[$x] == 'ASC') {
$curSort[$z] = $Sort[$x]; $curSort[$z] = $Sort[$x];
$sel = ' selected="selected"'; $sel = ' selected="selected"';
@@ -1014,8 +1022,13 @@ for ($x = 0; $x < $col; $x++) {
$qry_orderby .= ', '; $qry_orderby .= ', ';
} }
if (!empty($curField[$x]) && !empty($curSort[$x])) { if (!empty($curField[$x]) && !empty($curSort[$x])) {
$qry_orderby .= $curField[$x] . ' ' . $curSort[$x]; // if they have chosen all fields using the * selector,
$last_orderby = 1; // then sorting is not available
// Robbat2 - Fix for Bug #570698
if(substr($curField[$x],-2) != '.*')
{ $qry_orderby .= $curField[$x] . ' ' . $curSort[$x];
$last_orderby = 1;
}
} }
} // end for } // end for
if (!empty($qry_orderby)) { if (!empty($qry_orderby)) {