From 83202248a466735f3e4119bb9f849a35cf979e20 Mon Sep 17 00:00:00 2001
From: Vitaliy Filippov <vitalif@yourcmc.ru>
Date: Wed, 27 Jan 2016 18:14:59 +0300
Subject: [PATCH] Remove "attachment already obsolete" error, fix
 longdesclength argument check

---
 Bugzilla/Attachment.pm                          | 5 -----
 process_bug.cgi                                 | 2 +-
 template/en/default/global/code-error.html.tmpl | 5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index 1e8cdb3a2..595e639ba 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -737,11 +737,6 @@ sub validate_obsolete
             ThrowCodeError('mismatched_bug_ids_on_obsolete', $vars);
         }
 
-        if ($attachment->isobsolete)
-        {
-            ThrowCodeError('attachment_already_obsolete', $vars);
-        }
-
         push(@obsolete_attachments, $attachment);
     }
     return @obsolete_attachments;
diff --git a/process_bug.cgi b/process_bug.cgi
index 2d112233f..3cf8d6b22 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -221,7 +221,7 @@ if ($ARGS->{delta_ts})
 
         $vars->{title_tag} = "mid_air";
 
-        ThrowCodeError('undefined_field', { field => 'longdesclength' }) if !$ARGS->{longdesclength};
+        ThrowCodeError('undefined_field', { field => 'longdesclength' }) if !defined $ARGS->{longdesclength};
 
         $vars->{start_at} = $ARGS->{longdesclength};
         # Always sort midair collision comments oldest to newest,
diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index 3c5d6c165..ec986073f 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -65,11 +65,6 @@
   of the <em>action</em> variable.
 [% END %]
 
-[% BLOCK error_attachment_already_obsolete %]
-  Attachment #[% attach_id FILTER html %] ([% description FILTER html %])
-  is already obsolete.
-[% END %]
-
 [% BLOCK error_attachment_local_storage_disabled %]
   [% title = "Local Storage Disabled" %]
   You cannot store attachments locally. This feature is disabled.