Make sure there are no DOS newline
authorJamie Cameron <jcameron@webmin.com>
Wed, 1 Dec 2010 00:39:07 +0000 (16:39 -0800)
committerJamie Cameron <jcameron@webmin.com>
Wed, 1 Dec 2010 00:39:07 +0000 (16:39 -0800)
file/FileManager.java

index 9434d86..ea0c8ee 100644 (file)
@@ -1594,6 +1594,10 @@ class EditorWindow extends FixedFrame implements CbButtonCallback
                                // Convert to DOS newlines
                                s = FileManager.replace_str(s, "\n", "\r\n");
                                }
+                       else {
+                               // Remove any DOS newlines
+                               s = FileManager.replace_str(s, "\r\n", "\n");
+                               }
                        URL u = new URL(filemgr.getDocumentBase(),
                                        "save.cgi"+filemgr.urlize(save_path)+
                                        "?rand="+System.currentTimeMillis()+