Ticket #2986: remove_newlines.diff

django/contrib/admin/options.py

@@ -18 +18 @@
 from django.utils.html import escape
 from django.utils.safestring import mark_safe
 from django.utils.functional import curry
-from django.utils.text import capfirst, get_text_list
+from django.utils.text import capfirst, get_text_list, normalize_newlines
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext, ugettext_lazy
 from django.utils.encoding import force_unicode
@@ -644 +644 @@
         if request.POST.has_key("_popup"):
             return HttpResponse('<script type="text/javascript">opener.dismissAddAnotherPopup(window, "%s", "%s");</script>' % \
                 # escape() calls force_unicode.
-                (escape(pk_value), escape(obj)))
+                # fixes #2986 by just removing newlines forcing everything into one long string.
+                (escape(pk_value), normalize_newlines(escape(obj)).replace('\n', ' ')))
         elif request.POST.has_key("_addanother"):
             self.message_user(request, msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name)))
             return HttpResponseRedirect(request.path)