Index: bug.php
===================================================================
RCS file: /repository/pearweb/public_html/bugs/bug.php,v
retrieving revision 1.33
diff -u -r1.33 bug.php
--- bug.php	20 May 2004 03:16:15 -0000	1.33
+++ bug.php	6 Jun 2004 16:09:39 -0000
@@ -5,6 +5,11 @@
 require_once './include/prepend.inc';
 require_once './include/cvs-auth.inc';
 require_once './include/trusted-devs.inc';
+/*
+ * NOTE: another require exists in the code below, so if changing
+ * the include path, make sure to change it too.
+ */
+
 
 error_reporting(E_ALL ^ E_NOTICE);
 
@@ -203,6 +208,7 @@
             if ($_POST['in']['status'] == $bug['status']) {
                 $_POST['in']['status'] = $RESOLVE_REASONS[$_POST['in']['resolve']]['status'];
             }
+            require './include/resolve.inc';
             $ncomment = addslashes($RESOLVE_REASONS[$_POST['in']['resolve']]['message'])
                       . "\n\n$ncomment";
         }
Index: include/functions.inc
===================================================================
RCS file: /repository/pearweb/public_html/bugs/include/functions.inc,v
retrieving revision 1.35
diff -u -r1.35 functions.inc
--- include/functions.inc	20 May 2004 14:36:16 -0000	1.35
+++ include/functions.inc	6 Jun 2004 16:09:39 -0000
@@ -663,4 +663,13 @@
     echo "\n\n<!-- END BUG NAV -->\n\n";
 }
 
+function show_reason_types($current="", $expanded=0)
+{
+	if ($expanded) echo "<option value=\"\"></option>\n";
+	while (list($k,$v) = each($GLOBALS['RESOLVE_REASONS'])) {
+		echo "<option value=\"$k\"", ($current==$k ? " selected" : ""),
+		     ">$v[desc]",($expanded?" ($v[status])":""),"</option>\n";
+	}
+}
+
 ?>
Index: include/prepend.inc
===================================================================
RCS file: /repository/pearweb/public_html/bugs/include/prepend.inc,v
retrieving revision 1.2
diff -u -r1.2 prepend.inc
--- include/prepend.inc	19 May 2004 13:28:01 -0000	1.2
+++ include/prepend.inc	6 Jun 2004 16:09:39 -0000
@@ -4,4 +4,4 @@
 
 //require_once './include/layout.inc';
 require_once './include/functions.inc';
-require_once './include/resolve.inc';
+require './include/resolve.inc';
Index: include/resolve.inc
===================================================================
RCS file: /repository/pearweb/public_html/bugs/include/resolve.inc,v
retrieving revision 1.3
diff -u -r1.3 resolve.inc
--- include/resolve.inc	27 Apr 2004 04:26:09 -0000	1.3
+++ include/resolve.inc	6 Jun 2004 16:09:40 -0000
@@ -47,8 +47,8 @@
     'desc' => 'Fixed in release',
     'message' =>
 'Thank you for your bug report. This issue has been fixed
-in the latest released version of the package, which you can download at 
-http://pear.php.net/packages.php',
+in the latest released version of the package, which you can download at
+http://pear.php.net/get/' . @txfield('package_name'),
   ),
   'needtrace' => array(
     'status' => 'Feedback',
@@ -133,12 +133,3 @@
 Thank you for your interest in PEAR.',
   )
 );
-
-function show_reason_types($current="", $expanded=0)
-{
-	if ($expanded) echo "<option value=\"\"></option>\n";
-	while (list($k,$v) = each($GLOBALS['RESOLVE_REASONS'])) {
-		echo "<option value=\"$k\"", ($current==$k ? " selected" : ""),
-		     ">$v[desc]",($expanded?" ($v[status])":""),"</option>\n";
-	}
-}