[interchange-cvs] interchange - racke modified dist/lib/UI/ContentEditor.pm

[interchange-cvs at icdevgroup.org]

User:      racke
Date:      2004-02-23 01:55:50 GMT
Modified:  dist/lib/UI ContentEditor.pm
Log:
ensure Unix lineends

Revision  Changes    Path
2.14      +4 -2      interchange/dist/lib/UI/ContentEditor.pm


rev 2.14, prev_rev 2.13
Index: ContentEditor.pm
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/ContentEditor.pm,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -r2.13 -r2.14
--- ContentEditor.pm	3 Nov 2003 16:26:14 -0000	2.13
+++ ContentEditor.pm	23 Feb 2004 01:55:50 -0000	2.14
@@ -2,7 +2,7 @@
 #
 # UI::ContentEditor - Interchange page/component edit
 # 
-# $Id: ContentEditor.pm,v 2.13 2003/11/03 16:26:14 racke Exp $
+# $Id: ContentEditor.pm,v 2.14 2004/02/23 01:55:50 racke Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -24,7 +24,7 @@
 
 package UI::ContentEditor;
 
-$VERSION = substr(q$Revision: 2.13 $, 10);
+$VERSION = substr(q$Revision: 2.14 $, 10);
 $DEBUG = 0;
 
 use POSIX qw/strftime/;
@@ -1900,6 +1900,7 @@
 		push @sets, "<!-- BEGIN PREAMBLE -->";
 		$ref->{PREAMBLE} =~ s/^\s*\n//;
 		$ref->{PREAMBLE} =~ s/\n\s*$//;
+		$ref->{PREAMBLE} =~ s/\r\n|\r/\n/g;
 		push @sets, $ref->{PREAMBLE};
 		push @sets, "<!-- END PREAMBLE -->";
 	}
@@ -1988,6 +1989,7 @@
 		push @bods, "<!-- BEGIN POSTAMBLE -->";
 		$ref->{POSTAMBLE} =~ s/^\s*\n//;
 		$ref->{POSTAMBLE} =~ s/\n\s*$//;
+		$ref->{POSTAMBLE} =~ s/\r\n|\r/\n/g;
 		push @bods, $ref->{POSTAMBLE};
 		push @bods, "<!-- END POSTAMBLE -->";
 	}