From: lpsolit%gmail.com <>
Date: Tue, 13 Sep 2005 02:06:28 +0000 (+0000)
Subject: Bug 308150: admin/products/deleted.html.tmpl doesn't include admin/products/footer... 
X-Git-Tag: bugzilla-2.21.1~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1161092ca5c84b39335f9c632c261efddcfaac93;p=thirdparty%2Fbugzilla.git

Bug 308150: admin/products/deleted.html.tmpl doesn't include admin/products/footer.html.tmpl - Patch by Frédéric Buclin <LpSolit@gmail.com> r=GavinS a=justdave
---

diff --git a/editproducts.cgi b/editproducts.cgi
index 1197264c4a..315dfd0599 100755
--- a/editproducts.cgi
+++ b/editproducts.cgi
@@ -629,6 +629,7 @@ if ($action eq 'delete') {
                                   {product => $product});
 
     $vars->{'product'} = $product;
+    $vars->{'classification'} = $classification;
 
     my $bug_ids = $dbh->selectcol_arrayref(q{
         SELECT bug_id FROM bugs
diff --git a/template/en/default/admin/products/deleted.html.tmpl b/template/en/default/admin/products/deleted.html.tmpl
index 6b31dbb09a..3252f97c9d 100644
--- a/template/en/default/admin/products/deleted.html.tmpl
+++ b/template/en/default/admin/products/deleted.html.tmpl
@@ -38,4 +38,8 @@
   Product [% product FILTER html %] deleted.
 </p>
 
+[% PROCESS admin/products/footer.html.tmpl
+           no_edit_product_link = 1
+%]
+
 [% PROCESS global/footer.html.tmpl %]
diff --git a/template/en/default/admin/products/footer.html.tmpl b/template/en/default/admin/products/footer.html.tmpl
index 157e715820..531e6c48eb 100644
--- a/template/en/default/admin/products/footer.html.tmpl
+++ b/template/en/default/admin/products/footer.html.tmpl
@@ -28,7 +28,7 @@
   # no_add_product_link
   #%]
 
-[% IF classification %]
+[% IF Param('useclassification') && classification %]
   [% classification_url_part = BLOCK %]&amp;classification=
      [%- classification FILTER url_quote %]
   [% END %]