From 179d6c8d7140d7ca710759ec35de00abcc646c4f Mon Sep 17 00:00:00 2001
From: "bbaetz%student.usyd.edu.au" <>
Date: Tue, 3 Dec 2002 17:44:38 +0000
Subject: Bug 182946 - fix regressions from bug 171493
(Bug.pm/show_bug.cgi/bug_form.pl reorg) r,a=justdave
---
Bug.pm | 10 +++++-----
Bugzilla/Bug.pm | 10 +++++-----
bugzilla.dtd | 4 ++--
template/en/default/bug/edit.html.tmpl | 4 ++--
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/Bug.pm b/Bug.pm
index 91c20780a..29f2e9b73 100755
--- a/Bug.pm
+++ b/Bug.pm
@@ -143,7 +143,7 @@ sub initBug {
"assigned_to", "reporter", "bug_file_loc", "short_desc",
"target_milestone", "qa_contact", "status_whiteboard",
"creation_ts", "delta_ts", "votes",
- "reporter_accessible", "cclist_accessible".
+ "reporter_accessible", "cclist_accessible",
"estimated_time", "remaining_time")
{
$fields{$field} = shift @row;
@@ -233,9 +233,9 @@ sub initBug {
if (@depends) {
$self->{'dependson'} = \@depends;
}
- my @blocks = EmitDependList("dependson", "blocked", $bug_id);
- if (@blocks) {
- $self->{'blocks'} = \@blocks;
+ my @blocked = EmitDependList("dependson", "blocked", $bug_id);
+ if (@blocked) {
+ $self->{'blocked'} = \@blocked;
}
return $self;
@@ -454,7 +454,7 @@ sub emitXML {
}
}
- foreach my $field ("dependson", "blocks", "cc") {
+ foreach my $field ("dependson", "blocked", "cc") {
if (defined $self->{$field}) {
for (my $i=0 ; $i < @{$self->{$field}} ; $i++) {
$xml .= " <$field>" . $self->{$field}[$i] . "$field>\n";
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 91c20780a..29f2e9b73 100755
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -143,7 +143,7 @@ sub initBug {
"assigned_to", "reporter", "bug_file_loc", "short_desc",
"target_milestone", "qa_contact", "status_whiteboard",
"creation_ts", "delta_ts", "votes",
- "reporter_accessible", "cclist_accessible".
+ "reporter_accessible", "cclist_accessible",
"estimated_time", "remaining_time")
{
$fields{$field} = shift @row;
@@ -233,9 +233,9 @@ sub initBug {
if (@depends) {
$self->{'dependson'} = \@depends;
}
- my @blocks = EmitDependList("dependson", "blocked", $bug_id);
- if (@blocks) {
- $self->{'blocks'} = \@blocks;
+ my @blocked = EmitDependList("dependson", "blocked", $bug_id);
+ if (@blocked) {
+ $self->{'blocked'} = \@blocked;
}
return $self;
@@ -454,7 +454,7 @@ sub emitXML {
}
}
- foreach my $field ("dependson", "blocks", "cc") {
+ foreach my $field ("dependson", "blocked", "cc") {
if (defined $self->{$field}) {
for (my $i=0 ; $i < @{$self->{$field}} ; $i++) {
$xml .= " <$field>" . $self->{$field}[$i] . "$field>\n";
diff --git a/bugzilla.dtd b/bugzilla.dtd
index 681a46f9b..0445d0a4e 100644
--- a/bugzilla.dtd
+++ b/bugzilla.dtd
@@ -5,7 +5,7 @@
maintainer CDATA #REQUIRED
exporter CDATA #IMPLIED
>
-
+
@@ -33,7 +33,7 @@
-
+
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 56483a779..fec8d122e 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -185,7 +185,7 @@
[% IF bug.milestoneurl %]
[% END %]
- Target Milestone:
+ Target Milestone:
[% "" IF bug.milestoneurl %]
@@ -504,7 +504,7 @@
Reassign bug to