Bug 159593 - usedependencies parameter must die. Patch by gerv; r=bbaetz.

diff --git a/Bug.pm b/Bug.pm
index 7e7478c46743ebc4d189d41ce6472a7208e8287c..df7a91553684615ae6eeffb5e5412024c76d8cf3 100755 (executable)
--- a/Bug.pm
+++ b/Bug.pm
@@ -217,16 +217,14 @@ sub initBug  {
   if (@longdescs) {
     $self->{'longdescs'} = \@longdescs;
   }
-
-  if (&::Param("usedependencies")) {
-    my @depends = EmitDependList("blocked", "dependson", $bug_id);
-    if ( @depends ) {
+  
+  my @depends = EmitDependList("blocked", "dependson", $bug_id);
+  if (@depends) {
       $self->{'dependson'} = \@depends;
-    }
-    my @blocks = EmitDependList("dependson", "blocked", $bug_id);
-    if ( @blocks ) {
-      $self->{'blocks'} = \@blocks;
-    }
+  }  
+  my @blocks = EmitDependList("dependson", "blocked", $bug_id);
+  if (@blocks) {
+    $self->{'blocks'} = \@blocks;
   }
 
   return $self;

diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm
index 7e7478c46743ebc4d189d41ce6472a7208e8287c..df7a91553684615ae6eeffb5e5412024c76d8cf3 100755 (executable)
--- a/Bugzilla/Bug.pm
+++ b/Bugzilla/Bug.pm
@@ -217,16 +217,14 @@ sub initBug  {
   if (@longdescs) {
     $self->{'longdescs'} = \@longdescs;
   }
-
-  if (&::Param("usedependencies")) {
-    my @depends = EmitDependList("blocked", "dependson", $bug_id);
-    if ( @depends ) {
+  
+  my @depends = EmitDependList("blocked", "dependson", $bug_id);
+  if (@depends) {
       $self->{'dependson'} = \@depends;
-    }
-    my @blocks = EmitDependList("dependson", "blocked", $bug_id);
-    if ( @blocks ) {
-      $self->{'blocks'} = \@blocks;
-    }
+  }  
+  my @blocks = EmitDependList("dependson", "blocked", $bug_id);
+  if (@blocks) {
+    $self->{'blocks'} = \@blocks;
   }
 
   return $self;

diff --git a/defparams.pl b/defparams.pl
index 4530a73c28da68822d457a2c2cc2454d6a632855..c0e1a9fa98b3beb5b84f0847a536ed934131234b 100644 (file)
--- a/defparams.pl
+++ b/defparams.pl
@@ -395,11 +395,6 @@ DefParam("usebrowserinfo",
          "b",
          1);
 
-DefParam("usedependencies",
-         "Do you wish to use dependencies (allowing you to mark which bugs depend on which other ones)?",
-         "b",
-         1);
-
 DefParam("usevotes",
          "Do you wish to allow users to vote for bugs? Note that in order for this to be effective, you will have to change the maximum votes allowed in a product to be non-zero in <a href=\"editproducts.cgi\">the product edit page</a>.",
          "b",

diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index a37be643b021ebbaf686353cc76da4e884e1613d..699ee55ac1cd386d2ecf1595361542d18f528f9f 100644 (file)
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -265,7 +265,6 @@
 
 [%# *** Dependencies Votes *** %]
 
-  [% IF Param('usedependencies') %]
   <table>
     <tr>
     [% PROCESS dependencies accesskey = "d"
@@ -287,7 +286,6 @@
        dep = { title => "<u>b</u>locks", fieldname => "blocked" } %]
     </tr>
   </table>
-  [% END %]
 
   [% IF use_votes %]
   <table>