CVS update: affelio/apps/diary (Affelio-cvs 1098) - Affelio

Index: affelio/apps/diary/Diary.pm
diff -u affelio/apps/diary/Diary.pm:1.36 affelio/apps/diary/Diary.pm:1.37

--- affelio/apps/diary/Diary.pm:1.36	Wed Mar  1 14:57:29 2006
+++ affelio/apps/diary/Diary.pm	Wed Mar  1 18:33:13 2006
@@ -497,9 +497,9 @@
 		$str =~ s/&lt;a +href=(&quot;)?(s?https?:\/\/[-_.!~*'()a-zA-Z0-9;\/?:\@&=+\$,%#]+) *(&quot;)? *&gt;/<a href="$2">/ig;
 		$str =~ s/&quot;"/"/g;
 #		$str =~ s/(\r\n|\r|\n)/<br \/>/g;
-		$str =~ s/\x0D\x0A/<BR>/g;
-		$str =~ s/\x0D/<BR>/g;
-		$str =~ s/\x0A/<BR>/g;
+		$str =~ s/\x0D\x0A/<br \/>/g;
+		$str =~ s/\x0D/<br \/>/g;
+		$str =~ s/\x0A/<br \/>/g;
 
 		while ($str =~ /(<(a|p|i|b|big|strong|small|em|u|blockquote)\b(?:(?!<\/\2>).)*(?:<\2>|$))/sigx) {
 			$self->errorExit("Error: You may mistype a tag or forget to close it.");
@@ -511,7 +511,8 @@
 
 sub br2n {
     my ($self, $str) = @_;
-    $str =~ s/<BR>/\x0D\x0A/ig;
+    $str =~ s/<br \/>/\x0D\x0A/ig;
+    $str =~ s/<br>/\x0D\x0A/ig;
     return $str;
 }
 ##############################################


Affelio