From 1ba10751a624a0b94d01aa66c9747fe81cba3e39 Mon Sep 17 00:00:00 2001
From: Frédéric Buclin
Date: Mon, 19 Jul 2010 00:44:55 +0200
Subject: Bug 579749: Linkify the URL found in attachments (restore the is_url
behavior) if there is only an URL in them r/a=LpSolit
---
template/en/default/attachment/edit.html.tmpl | 27 ++++++++++++++++++++++-----
1 file changed, 22 insertions(+), 5 deletions(-)
(limited to 'template')
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index d1861a7d3..b9e2497fd 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -172,7 +172,7 @@
[% ELSIF attachment.is_viewable %]
-
+
[% 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\/]$') %]
+