[phpBT-dev] CVS: phpbt query.php,1.42,1.43

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

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

Modified Files:
	query.php 
Log Message:
Code cleanup

Index: query.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/query.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- query.php	2001/11/14 14:28:06	1.42
+++ query.php	2001/11/23 05:08:59	1.43
@@ -126,7 +126,7 @@
 		if (!empty($flags)) $query[] = '('.delimit_list(' or ',$flags).')';
 
 		// Email field(s)
-		if ($email1) {
+		if (isset($email1)) {
 			switch($emailtype1) {
 				case 'like' : $econd = "like '%$email1%'"; break;
 				case 'rlike' : 
@@ -139,7 +139,7 @@
 
 		// Text search field(s)
 		foreach(array('title','description','url') as $searchfield) {
-			if ($$searchfield) {
+			if (isset($$searchfield)) {
 				switch (${$searchfield."_type"}) {
 					case 'like' : $cond = "like '%".$$searchfield."%'"; break;
 					case 'rlike' : $cond = "rlike '".$$searchfield."'"; break;
@@ -151,9 +151,9 @@
 		if (!empty($fields)) $query[] = '('.delimit_list(' or ',$fields).')';
 
 		// Project/Version/Component
-		if ($projects) {
-			$proj[] = "bug.project_id = $projects";
-			if ($versions) $proj[] = "bug.version_id = $versions";
+		if (isset($projects)) {
+			$proj[] = "b.project_id = $projects";
+			if ($versions) $proj[] = "b.version_id = $versions";
 			if ($components) $proj[] = "component_id = $components";
 			$query[] = '('.delimit_list(' and ',$proj).')';
 		}
@@ -240,7 +240,7 @@
 		'description' => 'description',
 		'url' => 'url',
 		'severity_name' => 'severity.sort_order',
-		'priority' => 'bug.priority',
+		'priority' => 'b.priority',
 		'status_name' => 'status.sort_order',
 		'owner' => 'owner',
 		'reporter' => 'reporter',