Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 952284 - Tags set to private comments should not be disclosed to everybody in the bug activity table

Browse Source 
r=LpSolit,a=sgreen


git-svn-id: svn://10.0.0.236/trunk@265164 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
bzrmirror%bugzilla.org 2014-01-02 23:30:43 +00:00
parent fb1d54cbe5
commit 5d17c6384f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@ -1 +1 @@
8848
8849

11
mozilla/webtools/bugzilla/Bugzilla/Bug.pm
View File

@ -3872,6 +3872,15 @@ sub get_activity {
&& $include_comment_tags
&& !$attach_id)
{
# Only includes comment tag activity for comments the user is allowed to see.
$suppjoins = "";
$suppwhere = "";
if (!Bugzilla->user->is_insider) {
$suppjoins = "INNER JOIN longdescs
ON longdescs.comment_id = longdescs_tags_activity.comment_id";
$suppwhere = "AND longdescs.isprivate = 0";
}
$query .= "
UNION ALL
SELECT 'comment_tag' AS name,
@ -3883,8 +3892,10 @@ sub get_activity {
longdescs_tags_activity.comment_id as comment_id
FROM longdescs_tags_activity
INNER JOIN profiles ON profiles.userid = longdescs_tags_activity.who
$suppjoins
WHERE longdescs_tags_activity.bug_id = ?
$datepart
$suppwhere
";
push @args, $self->id;
push @args, $starttime if defined $starttime;