[phpBT-dev] CVS: phpbt bug.php,1.153,1.154

[Ulf E. <ulf...@us...>]

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

Modified Files:
	bug.php 
Log Message:
Changes to the CloseBug permission


Index: bug.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/bug.php,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- bug.php	2 Oct 2005 21:04:50 -0000	1.153
+++ bug.php	5 Oct 2005 20:28:53 -0000	1.154
@@ -424,15 +424,21 @@
 	$url = isset($url) && $may_edit ? $url : $buginfo['url'];
 	$severity_id = isset($severity_id) && $may_edit ? (int) $severity_id : $buginfo['severity_id'];
 	$priority = isset($priority) && $may_edit ? (int) $priority : $buginfo['priority'];
+	$resolution_id = isset($resolution_id) && $may_close ? (int) $resolution_id : $buginfo['resolution_id'];
 	$status_id = isset($status_id) && $may_edit ? (int) $status_id : $buginfo['status_id'];
-	if (is_closed($status_id) && !$may_close) {
-		$status_id = $buginfo['status_id'];
+	if (!$may_close) {
+		if (is_closed($status_id)) {
+			$status_id = $buginfo['status_id'];
+		}
+		else if (is_closed($buginfo['status_id'])) {
+			$resolution_id = 0;
+			$changedfields['resolution_id'] = 0;
+		}
 	}
 	$database_id = isset($database_id) && $may_edit ? (int) $database_id : $buginfo['database_id'];
 	$to_be_closed_in_version_id = isset($to_be_closed_in_version_id) && $may_close ? (int) $to_be_closed_in_version_id : $buginfo['to_be_closed_in_version_id'];
 	$closed_in_version_id = isset($closed_in_version_id) && $may_close ? (int) $closed_in_version_id : $buginfo['closed_in_version_id'];
 	$site_id = isset($site_id) && $may_edit ? (int) $site_id : $buginfo['site_id'];
-	$resolution_id = isset($resolution_id) && $may_close ? (int) $resolution_id : $buginfo['resolution_id'];
 	$assigned_to = isset($assigned_to) && $may_edit ? (int) $assigned_to : $buginfo['assigned_to'];
 	if (isset($perm) and $perm->have_perm_proj($project_id) and isset($created_by) && is_numeric($created_by)) {
 		$created_by = (int) $created_by;