From adb956699853707c7a400f8a3ba5ac848d5f96b3 Mon Sep 17 00:00:00 2001
From: Christian Schneider
Date: Thu, 21 Jun 2007 13:11:54 +0000
Subject: Fix sorting with additional url parameters (used in AdServer)

---
 db_table.class | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/db_table.class b/db_table.class
index e38ecec..f45155f 100644
--- a/db_table.class
+++ b/db_table.class
@@ -302,9 +302,6 @@ function dump_html($tableargs="", $sqlwhere="", $c_fields="", $c_descriptions=""
 
 	echo "<table $tableargs>\n";
 
-	if (empty($thispage)) $thispage = $_SERVER['PHP_SELF'];
-	if (strstr($thispage, "?")) $thispage .= "&"; else $thispage .= "?";
-
 	/* Wenn man keine Titelzeile will, für c_descriptions einfach "," angeben */
 	if ($descriptions[0])
 	{
@@ -313,7 +310,7 @@ function dump_html($tableargs="", $sqlwhere="", $c_fields="", $c_descriptions=""
 		{
 			if ($_REQUEST[$table_sort] == $fields[$i])
 			{
-				$newsort = "$_REQUEST[$table_sort]+DESC";
+				$newsort = "$_REQUEST[$table_sort] DESC";
 				$sortimg = '<img src="/icons/down.gif" border="0" width="10" height="11" alt="">';
 			}
 			else if ($_REQUEST[$table_sort] == "$fields[$i] DESC")
@@ -329,8 +326,8 @@ function dump_html($tableargs="", $sqlwhere="", $c_fields="", $c_descriptions=""
 
 			echo "<th align=\"left\">\n";
 			echo "<table border=\"0\">\n<tr valign=\"middle\">\n";
-			echo '<td><a href="'. $thispage . $table_sort .'='. $newsort .'">'. $descriptions[$i] .'</a></td>';
-			echo '<td><a href="'. $thispage . $table_sort .'='. $newsort .'">'. $sortimg .'</a></td>';
+			echo '<td><a href="'. it_html::U($thispage, array($table_sort => $newsort) + $_GET) .'">'. $descriptions[$i] .'</a></td>';
+			echo '<td><a href="'. it_html::U($thispage, array($table_sort => $newsort) + $_GET) .'">'. $sortimg .'</a></td>';
 			echo "</tr>\n</table>\n";
 			echo "</th>\n";
 		}
-- 
cgit v1.2.3