diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-12-28 17:35:04 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-12-28 17:35:04 +0100 |
| commit | b10a11cc341499745c0495406bd207db4982b322 (patch) | |
| tree | 25a572c760e8de08a23470c67109dd29059a6cf9 | |
| parent | b300c83e7b907f14c9f94a50370aab6f8fb3d1a7 (diff) | |
| parent | fc18ef1ad344a14174332cd04a04d8182ab85d4b (diff) | |
| download | bugzilla-b10a11cc341499745c0495406bd207db4982b322.tar.gz bugzilla-b10a11cc341499745c0495406bd207db4982b322.tar.xz | |
merged with bugzilla/4.2
| -rw-r--r-- | Bugzilla/Bug.pm | 2 | ||||
| -rw-r--r-- | extensions/Example/Extension.pm | 8 | ||||
| -rw-r--r-- | template/en/default/bug/field-events.js.tmpl | 1 | ||||
| -rw-r--r-- | template/en/default/bug/field-help.none.tmpl | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/Bugzilla/Bug.pm b/Bugzilla/Bug.pm index 6c23d6992..13387ae80 100644 --- a/Bugzilla/Bug.pm +++ b/Bugzilla/Bug.pm @@ -1383,7 +1383,7 @@ sub _check_bug_status { } # Check if a comment is required for this change. - if ($new_status->comment_required_on_change_from($old_status) && !$comment) + if ($new_status->comment_required_on_change_from($old_status) && !$comment->{'thetext'}) { ThrowUserError('comment_required', { old => $old_status, new => $new_status }); diff --git a/extensions/Example/Extension.pm b/extensions/Example/Extension.pm index 3208d701a..fe29beb0b 100644 --- a/extensions/Example/Extension.pm +++ b/extensions/Example/Extension.pm @@ -459,7 +459,13 @@ sub error_catch { my $new_error_msg = "Ah ah, you tried to access $page_id? Good try!"; $new_error_msg = html_quote($new_error_msg); # There are better tools to parse an HTML page, but it's just an example. - $$page =~ s/(?<=<td id="error_msg" class="throw_error">).*(?=<\/td>)/$new_error_msg/si; + # Since Perl 5.16, we can no longer write "class" inside look-behind + # assertions, because "ss" is also seen as the german ß character, which + # makes Perl 5.16 complain. The right fix is to use the /aa modifier, + # but it's only understood since Perl 5.14. So the workaround is to write + # "clas[s]" instead of "class". Stupid and ugly hack, but it works with + # all Perl versions. + $$page =~ s/(?<=<td id="error_msg" clas[s]="throw_error">).*(?=<\/td>)/$new_error_msg/si; } sub flag_end_of_update { diff --git a/template/en/default/bug/field-events.js.tmpl b/template/en/default/bug/field-events.js.tmpl index f1d5afd32..3133c159b 100644 --- a/template/en/default/bug/field-events.js.tmpl +++ b/template/en/default/bug/field-events.js.tmpl @@ -55,6 +55,7 @@ [% FOREACH controlled_field = legal_value.controlled_values.keys %] [% SET cont_ids = [] %] [% FOREACH val = legal_value.controlled_values.$controlled_field %] + [% NEXT IF !val.is_active %] [% cont_ids.push(val.id) %] [% END %] [% NEXT IF !cont_ids.size %] diff --git a/template/en/default/bug/field-help.none.tmpl b/template/en/default/bug/field-help.none.tmpl index 7ae9991ec..a9449fbcd 100644 --- a/template/en/default/bug/field-help.none.tmpl +++ b/template/en/default/bug/field-help.none.tmpl @@ -91,7 +91,7 @@ estimated_time => keywords => "You can add keywords from a defined list to $terms.bugs, in order" - _ " to tag and group them.", + _ " to easily identify and group them.", longdesc => "$terms.Bugs have comments added to them by $terms.Bugzilla users." |