Bug 579749: Linkify the URL found in attachments (restore the is_url behavior)…

template/en/default/attachment/edit.html.tmpl

@@ -172,7 +172,7 @@
             </b></p>
           </div>
         [% ELSIF attachment.is_viewable %]
-          <div >
+          <div>
             [% INCLUDE global/textarea.html.tmpl
               id      = 'editFrame'
               name    = 'comment'
@@ -183,10 +183,27 @@
               defaultcontent = (attachment.contenttype.match('^text\/')) ?
                                  attachment.data.replace('(.*\n|.+)', '>$1') : undef
             %]
+            [%# The regexp is stolen from quoteUrls(), see Template.pm %]
+            [% safe_protocols = constants.SAFE_PROTOCOLS.join('|') %]
+            [% IF attachment.contenttype == 'text/plain'
+                  && attachment.data.match("^($safe_protocols):" _ '[^\s<>\"]+[\w\/]$') %]
+              <p>
+                <a href="[% attachment.data FILTER html %]">
+                  [% IF attachment.datasize < 120 %]
+                    [% attachment.data FILTER html %]
+                  [% ELSE %]
+                    [% attachment.data FILTER truncate(80) FILTER html %]
+                    ...
+                    [% attachment.data.match('.*(.{20})$').0 FILTER html %]
+                  [% END %]
+                </a>
+              </p>
+            [% ELSE %]
               <iframe id="viewFrame" src="attachment.cgi?id=[% attachment.id %]">
                 <b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
                 <a href="attachment.cgi?id=[% attachment.id %]">View the attachment on a separate page</a>.</b>
               </iframe>
+            [% END %]
             <script type="text/javascript">
               <!--
               var patchviewerinstalled = 0;