Modified bug_resolve to use only one form.

git-svn-id: http://mantisbt.svn.sourceforge.net/svnroot/mantisbt/trunk@833 f5dc347c-c33d-0410-90a0-b07cc1902cb9

bug_resolve_page.php

@@ -18,8 +18,8 @@
 <?php # Resolve Form BEGIN ?>
 <p>
 <div align="center">
-<table class="width50" cellspacing="1">
-<form method="post" action="<?php echo $g_bug_resolve_page2 ?>">
+<table class="width75" cellspacing="1">
+<form method="post" action="<?php echo $g_bug_resolve ?>">
 <input type="hidden" name="f_id" value="<?php echo $f_id ?>">
 <tr>
 	<td class="form-title" colspan="2">
@@ -54,6 +54,16 @@
 	</td>
 </tr>
 <?php } ?>
+<tr class="row-1">
+	<td class="category" colspan="2">
+		<?php echo $s_add_bugnote_title ?>
+	</td>
+</tr>
+<tr class="row-1">
+	<td class="center" colspan="2">
+		<textarea name="f_bugnote_text" cols="80" rows="10" wrap="virtual"></textarea>
+	</td>
+</tr>
 <tr>
 	<td class="center" colspan="2">
 		<input type="submit" value="<?php echo $s_resolve_bug_button ?>">
@@ -63,5 +73,9 @@
 </table>
 </div>
 <?php # Resolve Form END ?>
+</form>
+</table>
+
+<?php include( $g_view_bug_inc ) ?>
 
 <?php print_page_bot1( __FILE__ ) ?>

core_user_API.php

@@ -462,7 +462,7 @@ function project_check( $p_bug_id ) {
 
 		$t_project_id = get_bug_field( $p_bug_id, "project_id" );
 		if ( $t_project_id != $g_project_cookie_val ) {
-			setcookie( $g_project_cookie, $t_project_id, time()+$g_cookie_time_length );
+			setcookie( $g_project_cookie, $t_project_id, time()+$g_cookie_time_length, $g_cookie_path );
 			$t_redirect_url = get_view_redirect_url( $p_bug_id, 1 );
 			print_header_redirect( $t_redirect_url );
 		}

doc/ChangeLog

@@ -65,6 +65,7 @@ Mantis
  * Modified default/config_inc1.php to have more more css global variables.
  * Modified wordwrap to use built-in php function if available.
  * Modified bug_assign and bug_close to use g_quick_proceed.
+ * Modified bug_resolve to use only one form.
  * Added project name as supplementary info next to bug id in buglist for "All projects" option
  * Added Basic Authentication patch.
  * Added CSV Export patch.