Backing out the checkin for bug 180966 (fix warnings in web server error log). This...

if timetracking is not enabled.

diff --git a/Bugzilla/User.pm b/Bugzilla/User.pm
index a45cf09765ed5d59a1a8ff04b34829aad1ccdf2b..b12b5e135871b5aa91c764fead33ad8951ff1c13 100644 (file)
--- a/Bugzilla/User.pm
+++ b/Bugzilla/User.pm
@@ -267,7 +267,7 @@ sub match_field {
         next if !defined($vars->{'mform'}->{$field});
 
         # Skip it if this is a --do_not_change-- field
-        next if $dontchange && $dontchange eq $vars->{'form'}->{$field};
+        next if $dontchange eq $vars->{'form'}->{$field};
 
         # We need to move the query to $raw_field, where it will be split up,
         # modified by the search, and put back into $::FORM and $::MFORM

diff --git a/process_bug.cgi b/process_bug.cgi
index 40c9c2a08f8c8143cd91361cdb807c6e06367e38..531706582480b247a298af714f1a2c8fbaad9d89 100755 (executable)
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -109,8 +109,6 @@ if (defined $::FORM{'dup_id'} && $::FORM{'knob'} eq "duplicate") {
 
 ValidateComment($::FORM{'comment'});
 
-$::FORM{'dontchange'} = '' unless exists $::FORM{'dontchange'};
-
 # If the bug(s) being modified have dependencies, validate them
 # and rebuild the list with the validated values.  This is important
 # because there are situations where validation changes the value
@@ -1204,22 +1202,21 @@ foreach my $id (@idlist) {
     SendSQL("select now()");
     $timestamp = FetchOneColumn();
 
-    if (UserInGroup(Param('timetrackinggroup'))) {
-        if ($::FORM{'work_time'} > 99999.99) {
-            ThrowUserError("value_out_of_range", {field => 'work_time'});
-        }
-        if (defined $::FORM{'comment'} || defined $::FORM{'work_time'}) {
-            if ($::FORM{'work_time'} != 0 && 
-                (!defined $::FORM{'comment'} || $::FORM{'comment'} =~ /^\s*$/)) {
-                ThrowUserError('comment_required');
-            } else {
-                AppendComment($id, $::COOKIE{'Bugzilla_login'}, $::FORM{'comment'},
-                              $::FORM{'commentprivacy'}, $timestamp, $::FORM{'work_time'});
-                if ($::FORM{'work_time'} != 0) {
-                    LogActivityEntry($id, "work_time", "", $::FORM{'work_time'},
-                                     $whoid, $timestamp);
-                    $bug_changed = 1;
-                }
+    if ($::FORM{'work_time'} > 99999.99) {
+        ThrowUserError("value_out_of_range", {field => 'work_time'});
+    }
+    if (defined $::FORM{'comment'} || defined $::FORM{'work_time'}) {
+        if ($::FORM{'work_time'} != 0 && 
+            (!defined $::FORM{'comment'} || $::FORM{'comment'} =~ /^\s*$/)) {
+        
+            ThrowUserError('comment_required');
+        } else {
+            AppendComment($id, $::COOKIE{'Bugzilla_login'}, $::FORM{'comment'},
+                $::FORM{'commentprivacy'}, $timestamp, $::FORM{'work_time'});
+            if ($::FORM{'work_time'} != 0) {
+                LogActivityEntry($id, "work_time", "", $::FORM{'work_time'},
+                                 $whoid, $timestamp);
+                $bug_changed = 1;
             }
         }
     }

diff --git a/showdependencytree.cgi b/showdependencytree.cgi
index 0508f078bf11f8038587c32a2301a641f4be3364..e2e9d52b0ed76de71d6c012cb5a02c6e1e7cdbbd 100755 (executable)
--- a/showdependencytree.cgi
+++ b/showdependencytree.cgi
@@ -164,7 +164,7 @@ sub GetBug {
          $bug->{'assignee_email'}) = FetchSQLData();
      }
     
-    $bug->{'open'} = $bug->{'exists'} && IsOpenedState($bug->{'status'});
+    $bug->{'open'} = IsOpenedState($bug->{'status'});
     $bug->{'dependencies'} = [];
     
     return $bug;