Bug 119703: Create an attachment by pasting it into a text field

r/a=mkanat

3 files changed, 3 insertions, 18 deletions

diff --git a/template/en/default/global/code-error.html.tmpl b/template/en/default/global/code-error.html.tmpl
index dd05c239a..e507c584f 100644
--- a/template/en/default/global/code-error.html.tmpl
+++ b/template/en/default/global/code-error.html.tmpl
@@ -37,11 +37,7 @@
 [% DEFAULT title = "Internal Error" %]
 
 [% error_message = BLOCK %]
-  [% IF error == "attachment_url_disabled" %]
-    [% title = "Attachment URL Disabled" %]
-    You cannot attach a URL. This feature is currently disabled.
-
-  [% ELSIF error == "auth_invalid_email" %]
+  [% IF error == "auth_invalid_email" %]
     [% title = "Invalid Email Address" %]
     We received an email address (<b>[% addr FILTER html %]</b>)
     that didn't pass our syntax checking for a legal email address,
diff --git a/template/en/default/global/field-descs.none.tmpl b/template/en/default/global/field-descs.none.tmpl
index 2ef558ce4..741eecf83 100644
--- a/template/en/default/global/field-descs.none.tmpl
+++ b/template/en/default/global/field-descs.none.tmpl
@@ -108,7 +108,6 @@
      "attachments.ispatch"     => "Attachment is patch",
      "attachments.isobsolete"  => "Attachment is obsolete",
      "attachments.isprivate"   => "Attachment is private",
-     "attachments.isurl"       => "Attachment is a URL",
      "attachments.submitter"   => "Attachment creator",
      "blocked"                 => "Blocks",
      "bug_file_loc"            => "URL",
diff --git a/template/en/default/global/user-error.html.tmpl b/template/en/default/global/user-error.html.tmpl
index 0f094b3a5..8380f7f0c 100644
--- a/template/en/default/global/user-error.html.tmpl
+++ b/template/en/default/global/user-error.html.tmpl
@@ -222,11 +222,6 @@
     [% title = "Attachment Deletion Disabled" %]
     Attachment deletion is disabled on this installation.
 
-  [% ELSIF error == "attachment_illegal_url" %]
-    [% title = "Illegal Attachment URL" %]
-    <em>[% url FILTER html %]</em> is not a legal URL for attachments.
-    It must start either with http://, https:// or ftp://.
-
   [% ELSIF error == "attachment_removed" %]
     [% title = "Attachment Removed" %]
     The attachment you are attempting to access has been removed.
@@ -582,13 +577,8 @@
     [%# Hack to get the max value between both limits %]
     [%+ max_limit.nsort.last FILTER html %] KB. <br>
     We recommend that you store your attachment elsewhere
-    [% IF Param("allow_attach_url") %]
-      and then specify the URL to this file on the attachment
-      creation page in the <b>AttachURL</b> field.
-    [% ELSE %]
-      and then insert the URL to it in a comment, or in the URL field
-      for this [% terms.bug %].
-    [% END %]
+    and then paste the URL to this file on the attachment
+    creation page in the appropriate text field.
     <br>Alternately, if your attachment is an image, you could convert
     it to a compressible format like JPG or PNG and try again.