diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2013-01-07 17:03:40 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-01-07 17:03:40 +0100 |
| commit | df058f2b9168fa02899a6eea63b19efc750487bf (patch) | |
| tree | 3bc0b551fc3d7600bfd6664e732ac309ca4f7140 | |
| parent | aeb35cd1a50134f8e69a7d925dca4bd54fdc3bde (diff) | |
| parent | d758a8169eacbccc0a65d6fd68e49f8eb8b713be (diff) | |
| download | bugzilla-df058f2b9168fa02899a6eea63b19efc750487bf.tar.gz bugzilla-df058f2b9168fa02899a6eea63b19efc750487bf.tar.xz | |
merged with bugzilla/4.2
| -rw-r--r-- | Bugzilla/Config/MTA.pm | 6 | ||||
| -rw-r--r-- | Bugzilla/Install/Requirements.pm | 7 | ||||
| -rw-r--r-- | Bugzilla/Mailer.pm | 6 | ||||
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/global/header.html.tmpl | 2 |
5 files changed, 21 insertions, 2 deletions
diff --git a/Bugzilla/Config/MTA.pm b/Bugzilla/Config/MTA.pm index c90e5dc76..aeded375f 100644 --- a/Bugzilla/Config/MTA.pm +++ b/Bugzilla/Config/MTA.pm @@ -34,6 +34,12 @@ package Bugzilla::Config::MTA; use strict; use Bugzilla::Config::Common; +# Return::Value 1.666002 pollutes the error log with warnings about this +# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send +# to disable these warnings. +BEGIN { + $Return::Value::NO_CLUCK = 1; +} use Email::Send; our $sortkey = 1200; diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm index 1e7fc97c6..39cacedb0 100644 --- a/Bugzilla/Install/Requirements.pm +++ b/Bugzilla/Install/Requirements.pm @@ -32,6 +32,13 @@ use List::Util qw(max); use Safe; use Term::ANSIColor; +# Return::Value 1.666002 pollutes the error log with warnings about this +# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send +# in have_vers() to disable these warnings. +BEGIN { + $Return::Value::NO_CLUCK = 1; +} + use base qw(Exporter); our @EXPORT = qw( REQUIRED_MODULES diff --git a/Bugzilla/Mailer.pm b/Bugzilla/Mailer.pm index d27f79155..7789af018 100644 --- a/Bugzilla/Mailer.pm +++ b/Bugzilla/Mailer.pm @@ -48,6 +48,12 @@ use Encode qw(encode); use Encode::MIME::Header; use Email::Address; use Email::MIME; +# Return::Value 1.666002 pollutes the error log with warnings about this +# deprecated module. We have to set NO_CLUCK = 1 before loading Email::Send +# to disable these warnings. +BEGIN { + $Return::Value::NO_CLUCK = 1; +} use Email::Send; use Sys::Hostname; diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 22ca4ebab..7f2087467 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -330,7 +330,7 @@ TUI_hide_default('attachment_text_field'); bug = default, field = bug_fields.op_sys, editable = 1, value = default.op_sys %] </tr> - [% IF !Param('defaultplatform') || !Param('defaultopsys') %] + [% IF (!Param('defaultplatform') || !Param('defaultopsys')) && !cloned_bug_id %] <tr> <th colspan="3"> </th> <td id="os_guess_note" class="comment"> diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index ab07b66d4..7b7739ec5 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -249,7 +249,7 @@ #%] <body onload="[% onload %]" - class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') %] + class="[% urlbase.replace('^https?://','').replace('/$','').replace('[-~@:/.]+','-') FILTER css_class_quote %] [% FOREACH class = bodyclasses %] [% ' ' %][% class FILTER css_class_quote %] [% END %] yui-skin-sam"> |