Bug 765143: SecureMail needs to sanitize all bug_link references in html

bugmail. r=glob

1 files changed, 30 insertions, 14 deletions

diff --git a/extensions/SecureMail/Config.pm b/extensions/SecureMail/Config.pm
index 436b4753d..df7d5d928 100644
--- a/extensions/SecureMail/Config.pm
+++ b/extensions/SecureMail/Config.pm
@@ -21,21 +21,37 @@
 
 package Bugzilla::Extension::SecureMail;
 use strict;
+
+use Bugzilla::Constants;
+use Bugzilla::Install::Util qw(vers_cmp);
+
 use constant NAME => 'SecureMail';
 
-use constant REQUIRED_MODULES => [
-    {
-        package => 'Crypt-OpenPGP',
-        module  => 'Crypt::OpenPGP',
-        # 1.02 added the ability for new() to take KeyRing objects for the
-        # PubRing argument.
-        version => '1.02',
-    },
-    {
-        package => 'Crypt-SMIME',
-        module  => 'Crypt::SMIME',
-        version => 0,
-    },
-];
+sub REQUIRED_MODULES {
+    my $modules = [
+        {
+            package => 'Crypt-OpenPGP',
+            module  => 'Crypt::OpenPGP',
+            # 1.02 added the ability for new() to take KeyRing objects for the
+            # PubRing argument.
+            version => '1.02',
+        },
+        {
+            package => 'Crypt-SMIME',
+            module  => 'Crypt::SMIME',
+            version => 0,
+        },
+    ];
+    if (vers_cmp(BUGZILLA_VERSION, '4.2') > -1) {
+        push(@$modules, 
+            {
+                package => 'HTML-Tree', 
+                module  => 'HTML::Tree', 
+                version => 0, 
+            }
+        );
+    }
+    return $modules;
+}
 
 __PACKAGE__->NAME;