diff options
author | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
---|---|---|
committer | Dylan William Hardison <dylan@hardison.net> | 2018-04-01 16:52:36 +0200 |
commit | ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5 (patch) | |
tree | 483da9c8b66f4444bb8a410e3d599c7484ad721e /extensions/PhabBugz/lib/Util.pm | |
parent | daa2d6b1c40354ecce0e48e6c5ee686efe642c4b (diff) | |
parent | 2f8b999750cc700faf03c6aee1c53d1fc4df767f (diff) | |
download | bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.gz bugzilla-ab229b9a828b77f8a3b9ce215f0dfed4c84d4ae5.tar.xz |
Merge branch 'master' into unstable
Diffstat (limited to 'extensions/PhabBugz/lib/Util.pm')
-rw-r--r-- | extensions/PhabBugz/lib/Util.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/extensions/PhabBugz/lib/Util.pm b/extensions/PhabBugz/lib/Util.pm index 8085828f9..844d8c0b5 100644 --- a/extensions/PhabBugz/lib/Util.pm +++ b/extensions/PhabBugz/lib/Util.pm @@ -77,12 +77,12 @@ sub _get_revisions { } sub create_revision_attachment { - my ( $bug, $revision_id, $revision_title, $timestamp ) = @_; + my ( $bug, $revision, $timestamp ) = @_; my $phab_base_uri = Bugzilla->params->{phabricator_base_uri}; ThrowUserError('invalid_phabricator_uri') unless $phab_base_uri; - my $revision_uri = $phab_base_uri . "D" . $revision_id; + my $revision_uri = $phab_base_uri . "D" . $revision->id; # Check for previous attachment with same revision id. # If one matches then return it instead. This is fine as @@ -102,8 +102,8 @@ sub create_revision_attachment { bug => $bug, creation_ts => $timestamp, data => $revision_uri, - description => $revision_title, - filename => 'phabricator-D' . $revision_id . '-url.txt', + description => $revision->title, + filename => 'phabricator-D' . $revision->id . '-url.txt', ispatch => 0, isprivate => 0, mimetype => PHAB_CONTENT_TYPE, @@ -111,8 +111,8 @@ sub create_revision_attachment { ); # Insert a comment about the new attachment into the database. - $bug->add_comment('', { type => CMT_ATTACHMENT_CREATED, - extra_data => $attachment->id }); + $bug->add_comment($revision->summary, { type => CMT_ATTACHMENT_CREATED, + extra_data => $attachment->id }); return $attachment; } |