[phpBT-dev] CVS: phpbt include.php,1.122,1.123 query.php,1.89,1.90

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

Update of /cvsroot/phpbt/phpbt
In directory usw-pr-cvs1:/tmp/cvs-serv28669

Modified Files:
	include.php query.php 
Log Message:
Tweaks for the database column header needed as a result of dropping the database_version field.

Index: include.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/include.php,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- include.php	13 Sep 2002 18:13:25 -0000	1.122
+++ include.php	23 Sep 2002 20:48:21 -0000	1.123
@@ -85,8 +85,7 @@
   'resolution_name' => 'Resolution',
   'closed_in_version_name' => 'Closed in Version',
   'to_be_closed_in_version_name' => 'To be Closed in Version',
-  'database_version' => 'Database Version',
-  'database_provider' => 'Database Provider',
+  'database_name' => 'Database',
   'site_name' => 'Site',
   'reporter' => 'Reporter',
   'owner' => 'Owner',

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- query.php	23 Sep 2002 20:31:24 -0000	1.89
+++ query.php	23 Sep 2002 20:48:21 -0000	1.90
@@ -215,8 +215,7 @@
 		'version_name' => 'version.version_name',
 		'to_be_closed_in_version_name' => 'version2.version_name as v2',
 		'closed_in_version_name' => 'version3.version_name as v3',
-		'database_provider' => TBL_DATABASE.'.database_name',
-		'database_version' => TBL_DATABASE.'.database_version',
+		'database_name' => TBL_DATABASE.'.database_name',
 		'site_name' => 'site.site_name',
 		'component_name' => 'component.component_name',
 		'os_name' => 'os.os_name',
@@ -243,8 +242,7 @@
 		'os_name' => 'os_name',
 		'to_be_closed_in_version_name' => 'v2',
 		'closed_in_version_name' => 'v3',
-		'database_provider' => TBL_DATABASE.'.database_name',
-		'database_version' => TBL_DATABASE.'.database_version',
+		'database_name' => TBL_DATABASE.'.database_name',
 		'site_name' => 'site.sort_order',
 		'browser_string' => 'browser_string',
 		'resolution_name' => 'resolution.sort_order',
@@ -318,7 +316,8 @@
 			? "and {$HTTP_SESSION_VARS['queryinfo']['query']} " : ''),
 		$order, $sort), $llimit, $selrange)));
 
-	sorting_headers($me, $headers, $order, $sort, "page=$page".$paramstr);
+	sorting_headers($me, $headers, $order, $sort, "page=$page".
+		(!empty($paramstr) ? $paramstr : ''));
 	$t->wrap('buglist.html', 'buglist');
 }