diff options
| author |   Jeff Fearn <jfearn@redhat.com> | 2021-01-20 13:25:18 +1000 |
|---|---|---|
| committer | Jeff Fearn <jfearn@redhat.com> | 2021-01-20 13:25:18 +1000 |
| commit | 30ebeb8192fa7b884c187ce9a2f19f49bd14b849 (patch) | |
| tree | a66921ddb0d5ed1aa245c6206db2b9c7cb63dc9a | |
| parent | Release Version 5.0.4-rh51 (diff) | |
| parent | Bug 1917686 - Editing private comments sends emails to CC recipients, even pu... (diff) | |
| download | bugzilla-30ebeb8192fa7b884c187ce9a2f19f49bd14b849.tar.gz bugzilla-30ebeb8192fa7b884c187ce9a2f19f49bd14b849.tar.bz2 bugzilla-30ebeb8192fa7b884c187ce9a2f19f49bd14b849.zip | |
Merge branch 'qe'
Change-Id: I132cca9474ef2ede386a1cd9d23ab4b0639a1734
| -rw-r--r-- | Bugzilla/BugMail.pm | 4 | ||||
| -rw-r--r-- | Bugzilla/Constants.pm | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 55a8253bb..82c460fad 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -683,6 +683,10 @@ sub _get_diffs { $diff->{num} = $comment->count; $diff->{isprivate} = $diff->{new}; } + if ($diff->{field_name} eq 'longdesc') { + my $comment = $bug->comments({order => 'oldest_to_newest'})->[$diff->{old}]; + $diff->{isprivate} = $comment->{isprivate}; + } } my @changes = (); diff --git a/Bugzilla/Constants.pm b/Bugzilla/Constants.pm index 599a5ee39..31d964e0b 100644 --- a/Bugzilla/Constants.pm +++ b/Bugzilla/Constants.pm @@ -224,7 +224,7 @@ use constant LOCAL_FILE => 'bugzilla-update.xml'; # Relative to datadir. # When true CSS and JavaScript assets will be concatanted and minified at # run-time, to reduce the number of requests required to render a page. # Setting this to a false value can help debugging. -use constant CONCATENATE_ASSETS => 1; +use constant CONCATENATE_ASSETS => 0; # REDHAT EXTENSION 1886846 # These are unique values that are unlikely to match a string or a number, # to be used in criteria for match() functions and other things. They start |