[phpBT-dev] CVS: phpbt query.php,1.52,1.53 attachment.php,1.11,1.12

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

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

Modified Files:
	query.php attachment.php 
Log Message:
Cleanup

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- query.php	2002/01/05 19:49:35	1.52
+++ query.php	2002/01/19 15:11:25	1.53
@@ -234,7 +234,7 @@
 	$nr = $q->grab_field('select count(*) from '.TBL_BUG.' b 
 		left join '.TBL_AUTH_USER.' owner on b.assigned_to = owner.user_id
 		left join '.TBL_AUTH_USER.' reporter on b.created_by = reporter.user_id '.
-		($_sv['queryinfo']['query'] != '' ? "where {$_sv['queryinfo']['query']}": ''));
+		(!empty($_sv['queryinfo']['query']) ? "where {$_sv['queryinfo']['query']}": ''));
 
 	$_sv['queryinfo']['numrows'] = $nr;
 	list($selrange, $llimit, $npages, $pages) = multipages($nr,$page,
@@ -260,7 +260,7 @@
 		where b.severity_id = severity.severity_id and b.status_id = status.status_id 
 		and b.os_id = os.os_id and b.version_id = version.version_id 
 		and b.component_id = component.component_id and b.project_id = project.project_id '.
-		($_sv['queryinfo']['query'] != '' ? "and {$_sv['queryinfo']['query']} " : '').
+		(!empty($_sv['queryinfo']['query']) ? "and {$_sv['queryinfo']['query']} " : '').
 		"order by $order $sort, bug_id asc", $selrange, $llimit);
 				
 	$headers = array(

Index: attachment.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/attachment.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- attachment.php	2001/11/13 03:52:59	1.11
+++ attachment.php	2002/01/19 15:11:26	1.12
@@ -137,8 +137,8 @@
 	$t->set_var(array(
 		'error' => $error,
 		'bugid' => $bugid,
-		'projectid' => $projectid,
-		'description' => htmlspecialchars(stripslashes($description)),
+		'description' => isset($description) 
+			? htmlspecialchars(stripslashes($description)) : '',
 		'max_size' => ini_get('upload_max_filesize') < ATTACHMENT_MAX_SIZE 
 			? number_format(ini_get('upload_max_filesize'))
 			: number_format(ATTACHMENT_MAX_SIZE)