[phpBT-dev] CVS: phpbt query.php,1.98.2.7,1.98.2.8

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27728

Modified Files:
      Tag: htmltemplates
	query.php 
Log Message:
Fixed bugs with bug sorting and name conflicts with the various version fields

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.98.2.7
retrieving revision 1.98.2.8
diff -u -r1.98.2.7 -r1.98.2.8
--- query.php	3 May 2004 13:34:38 -0000	1.98.2.7
+++ query.php	27 Jul 2004 13:35:22 -0000	1.98.2.8
@@ -261,8 +261,8 @@
 		'last_modified_date' => 'b.last_modified_date',
 		'project_name' => 'project.project_name',
 		'version_name' => 'version.version_name',
-		'to_be_closed_in_version_name' => 'version2.version_name',
-		'closed_in_version_name' => 'version3.version_name',
+		'to_be_closed_in_version_name' => 'version2.version_name as to_be_closed_in_version_name',
+		'closed_in_version_name' => 'version3.version_name as closed_in_version_name',
 		'database_name' => TBL_DATABASE.'.database_name',
 		'site_name' => 'site.site_name',
 		'component_name' => 'component.component_name',
@@ -342,7 +342,7 @@
 	foreach ($desired_fields as $field) {
 		$query_fields[] = $query_db_fields[$field];
 		$field_titles[] = $all_db_fields[$field];
-		$headers[] = $db_headers[$field];
+		$headers[] = $field;
 	}
 
 	if (empty($_GET['xl'])) { // HTML view
@@ -364,7 +364,7 @@
 			sprintf($QUERY['query-list-bugs'], join(', ', $query_fields),
 				(!empty($_SESSION['queryinfo']['query'])
 				? "and {$_SESSION['queryinfo']['query']} " : ''),
-			$order, $sort), $llimit, $selrange)));
+			$db_headers[$order], $sort), $llimit, $selrange)));
 	
 		sorting_headers($me, $headers, $order, $sort, "page=$page".
 			(!empty($paramstr) ? $paramstr : ''));
@@ -374,7 +374,7 @@
 			sprintf($QUERY['query-list-bugs'], join(', ', $query_fields),
 				(!empty($_SESSION['queryinfo']['query'])
 				? "and {$_SESSION['queryinfo']['query']} " : ''),
-			$order, $sort)));
+			$db_headers[$order], $sort)));
 	}
 }