From 1cf4971f32fe1fffb3919c9a459e92f6a2c0ca02 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin <LpSolit@gmail.com>
Date: Fri, 15 Nov 2013 00:04:15 +0100
Subject: Bug 927900: Kill longdesclength r=dkl a=sgreen

---
 email_in.pl                                      |  1 -
 process_bug.cgi                                  |  9 +++------
 template/en/default/bug/comments.html.tmpl       | 14 ++------------
 template/en/default/bug/edit.html.tmpl           |  1 -
 template/en/default/bug/process/midair.html.tmpl |  9 ++-------
 5 files changed, 7 insertions(+), 27 deletions(-)

diff --git a/email_in.pl b/email_in.pl
index 183833008..03db450f7 100755
--- a/email_in.pl
+++ b/email_in.pl
@@ -251,7 +251,6 @@ sub process_bug {
     foreach my $field (keys %fields) {
         $cgi->param(-name => $field, -value => $fields{$field});
     }
-    $cgi->param('longdesclength', scalar @{ $bug->comments });
     $cgi->param('token', issue_hash_token([$bug->id, $bug->delta_ts]));
 
     require 'process_bug.cgi';
diff --git a/process_bug.cgi b/process_bug.cgi
index 90e363afa..ed1a19203 100755
--- a/process_bug.cgi
+++ b/process_bug.cgi
@@ -122,16 +122,14 @@ if ($delta_ts) {
     if ($first_delta_tz_z ne $delta_ts_z) {
         ($vars->{'operations'}) = $first_bug->get_activity(undef, $delta_ts);
 
-        my $start_at = $cgi->param('longdesclength')
-          or ThrowCodeError('undefined_field', { field => 'longdesclength' });
-
         # Always sort midair collision comments oldest to newest,
         # regardless of the user's personal preference.
-        my $comments = $first_bug->comments({ order => "oldest_to_newest" });
+        my $comments = $first_bug->comments({ order => 'oldest_to_newest',
+                                              after => $delta_ts });
 
         # Show midair if previous changes made other than CC
         # and/or one or more comments were made
-        my $do_midair = scalar @$comments > $start_at ? 1 : 0;
+        my $do_midair = scalar @$comments ? 1 : 0;
 
         if (!$do_midair) {
             foreach my $operation (@{ $vars->{'operations'} }) {
@@ -147,7 +145,6 @@ if ($delta_ts) {
 
         if ($do_midair) {
             $vars->{'title_tag'} = "mid_air";
-            $vars->{'start_at'} = $start_at;
             $vars->{'comments'} = $comments;
             $vars->{'bug'} = $first_bug;
             # The token contains the old delta_ts. We need a new one.
diff --git a/template/en/default/bug/comments.html.tmpl b/template/en/default/bug/comments.html.tmpl
index 61d1c67e0..a2fe4e52f 100644
--- a/template/en/default/bug/comments.html.tmpl
+++ b/template/en/default/bug/comments.html.tmpl
@@ -44,26 +44,16 @@
 //-->
 </script>
 
-[% DEFAULT start_at = 0 mode = "show" %]
-[% sort_order = user.settings.comment_sort_order.value %]
+[% DEFAULT mode = "show" %]
 [% user_cache = template_cache.users %]
 
-[%# NOTE: (start_at > 0) means we came here from a midair collision,
-  #       in which case we don't care what the user's preference is.
- %]
-[% IF (start_at > 0) %]
-    [% sort_order = "oldest_to_newest" %]
-[% END %]
-
 <!-- This auto-sizes the comments and positions the collapse/expand links 
      to the right. -->
 <table class="bz_comment_table" cellpadding="0" cellspacing="0"><tr>
 <td>
 
 [% FOREACH comment = comments %]
-  [% IF comment.count >= start_at %]
-    [% PROCESS a_comment %]
-  [% END %]
+  [% PROCESS a_comment %]
 [% END %]
 
 [% IF mode == "edit" && user.id
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index 8d38152fd..acdcdbf7a 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -46,7 +46,6 @@
 <form name="changeform" id="changeform" method="post" action="process_bug.cgi">
 
   <input type="hidden" name="delta_ts" value="[% bug.delta_ts %]">
-  <input type="hidden" name="longdesclength" value="[% bug.comments.size %]">
   <input type="hidden" name="id" value="[% bug.bug_id %]">
   <input type="hidden" name="token" value="[% issue_hash_token([bug.id, bug.delta_ts]) FILTER html %]">
 
diff --git a/template/en/default/bug/process/midair.html.tmpl b/template/en/default/bug/process/midair.html.tmpl
index 684b99639..17025fee7 100644
--- a/template/en/default/bug/process/midair.html.tmpl
+++ b/template/en/default/bug/process/midair.html.tmpl
@@ -11,10 +11,6 @@
   #   used by bug/activity/table.html.tmpl to display recent changes that will
   #   be overwritten if the user submits these changes.  See that template
   #   for further documentation.
-  # start_at: number; the comment at which show/comments.tmpl should begin
-  #   displaying comments, either the index of the last comment (if the user
-  #   entered a comment along with their change) or a number less than that
-  #   (if they didn't), in which case no comments are displayed.
   # comments: array; all the comments on the bug.
   # bug: Bugzilla::Bug; the bug being changed.
   #%]
@@ -40,7 +36,7 @@
   [% PROCESS "bug/activity/table.html.tmpl" incomplete_data=0 %]
 </p>
 
-[% IF comments.size > start_at %]
+[% IF comments.size %]
 <p>
   Added the comment(s):
   <blockquote>
@@ -71,7 +67,7 @@ You have the following choices:
           exclude="^Bugzilla_login|Bugzilla_password|delta_ts$" %]
       <input type="submit" id="process" value="Submit my changes anyway">
         This will cause all of the above changes to be overwritten
-        [% ", except for the added comment(s)" IF comments.size > start_at %].
+        [% ", except for the added comment(s)" IF comments.size %].
     </form>
   </li>
   [% IF cgi.param("comment") %]
@@ -82,7 +78,6 @@ You have the following choices:
         <input type="hidden" name="comment" value="[% cgi.param("comment") FILTER html %]">
         <input type="hidden" name="comment_is_private"
                value="[% cgi.param("comment_is_private") FILTER html %]">
-        <input type="hidden" name="longdesclength" value="[% bug.comments.size %]">
         <input type="hidden" name="token" value="[% cgi.param("token") FILTER html %]">
         <input type="submit" id="process_comment" value="Submit only my new comment">
       </form>
-- 
cgit v1.2.3-24-g4f1b