Merge remote-tracking branch 'origin/purge'

[public-inbox.git] / lib / PublicInbox / View.pm

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 0187ec332a58faaa4c89b6bb349a5fbb07f9c5fa..ca9b95505f6c767784d77023d8ec5fe500cf1a7e 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -557,16 +557,22 @@ sub add_text_body {
 
        return attach_link($upfx, $ct, $p, $fn) unless defined $s;
 
+       # makes no difference to browsers, and don't screw up filename
+       # link generation in diffs with the extra '%0D'
+       $s =~ s/\r\n/\n/sg;
+
        my ($diff, $spfx);
-       if ($ibx->{-repo_objs} && $s =~ /^(?:diff|---|\+{3}) /ms) {
+       if ($s =~ /^(?:diff|---|\+{3}) /ms) {
                $diff = [];
-               my $n_slash = $upfx =~ tr!/!/!;
-               if ($n_slash == 0) {
-                       $spfx = '../';
-               } elsif ($n_slash == 1) {
-                       $spfx = '';
-               } else { # nslash == 2
-                       $spfx = '../../';
+               if ($ibx->{-repo_objs}) {
+                       my $n_slash = $upfx =~ tr!/!/!;
+                       if ($n_slash == 0) {
+                               $spfx = '../';
+                       } elsif ($n_slash == 1) {
+                               $spfx = '';
+                       } else { # nslash == 2
+                               $spfx = '../../';
+                       }
                }
        };
 
@@ -890,11 +896,6 @@ sub missing_thread {
        PublicInbox::ExtMsg::ext_msg($ctx);
 }
 
-sub _msg_date {
-       my ($hdr) = @_;
-       fmt_ts(msg_datestamp($hdr));
-}
-
 sub fmt_ts { POSIX::strftime('%Y-%m-%d %k:%M', gmtime($_[0])) }
 
 sub dedupe_subject {