Fix for bug 92500: line-feeds were not being properly converted when submitting param...

Patch by Gervase Markham <gerv@mozilla.org>
r= ddk, justdave

diff --git a/doeditparams.cgi b/doeditparams.cgi
index 0ecd4be7603ea2a36ea828487bc68134ced4c8f0..a67175e91e91746f3e80effcf0ad004e40933b55 100755 (executable)
--- a/doeditparams.cgi
+++ b/doeditparams.cgi
@@ -51,7 +51,7 @@ foreach my $i (@::param_list) {
     if (exists $::FORM{"reset-$i"}) {
         $::FORM{$i} = $::param_default{$i};
     }
-    $::FORM{$i} =~ s/\r\n/\n/g;   # Get rid of windows-style line endings.
+    $::FORM{$i} =~ s/\r\n?/\n/g;   # Get rid of windows/mac-style line endings.
     $::FORM{$i} =~ s/^\n$//;      # assume single linefeed is an empty string
     if ($::FORM{$i} ne Param($i)) {
         if (defined $::param_checker{$i}) {