From: David Lawrence <dkl@mozilla.com>
Date: Wed, 30 Aug 2017 07:55:09 +0000 (+0000)
Subject: Revert "Bug 1395346 - Allow setting obsolete to false for phabricator attachments... 
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a164a52baf8b6b676627780114543d76329cbced;p=thirdparty%2Fbugzilla.git

Revert "Bug 1395346 - Allow setting obsolete to false for phabricator attachments when a user reclaims a revision"

This reverts commit c48fede1691feb1056cd21422716f297af9e7bc3.
---

diff --git a/extensions/PhabBugz/lib/WebService.pm b/extensions/PhabBugz/lib/WebService.pm
index e09a72036..5668eac81 100644
--- a/extensions/PhabBugz/lib/WebService.pm
+++ b/extensions/PhabBugz/lib/WebService.pm
@@ -231,16 +231,10 @@ sub obsolete_attachments {
         ThrowCodeError('param_required', { param => 'bug_id' })
     }
 
-    my $make_obsolete = $params->{make_obsolete};
-    unless (defined $make_obsolete) {
-        ThrowCodeError('param_required', { param => 'make_obsolete' })
-    }
-    $make_obsolete = $make_obsolete ? 1 : 0;
-
     my $bug = Bugzilla::Bug->check($bug_id);
 
     my @attachments =
-      grep { is_attachment_phab_revision($_, 1) } @{ $bug->attachments() };
+      grep { is_attachment_phab_revision($_) } @{ $bug->attachments() };
 
     return { result => [] } if !@attachments;
 
@@ -252,7 +246,7 @@ sub obsolete_attachments {
         my ($curr_revision_id) = ($attachment->filename =~ PHAB_ATTACHMENT_PATTERN);
         next if $revision_id != $curr_revision_id;
 
-        $attachment->set_is_obsolete($make_obsolete);
+        $attachment->set_is_obsolete(1);
         $attachment->update($timestamp);
 
         push(@updated_attach_ids, $attachment->id);