From 56e0ab0554dca2ba303897d214afcd8af0ecefc5 Mon Sep 17 00:00:00 2001
From: Dario Solera <dario.solera@threeplicate.com>
Date: Wed, 27 Jan 2010 18:01:12 +0000
Subject: [PATCH] Fixed #469: worked around IE issue (spurious <p>&nbsp;</p>
 added).

---
 AssemblyVersion.cs       |  4 ++--
 Core/ReverseFormatter.cs | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs
index 76facc7..47d178c 100644
--- a/AssemblyVersion.cs
+++ b/AssemblyVersion.cs
@@ -16,5 +16,5 @@ using System.Reflection;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.1.463")]
-[assembly: AssemblyFileVersion("3.0.1.463")]
+[assembly: AssemblyVersion("3.0.1.464")]
+[assembly: AssemblyFileVersion("3.0.1.464")]
diff --git a/Core/ReverseFormatter.cs b/Core/ReverseFormatter.cs
index cc69923..d592139 100644
--- a/Core/ReverseFormatter.cs
+++ b/Core/ReverseFormatter.cs
@@ -94,6 +94,8 @@ namespace ScrewTurn.Wiki {
 			buffer.Replace("<STRONG>", "<b>");
 			buffer.Replace("</strong>", "</b>");
 			buffer.Replace("</STRONG>", "</b>");
+			buffer.Replace("<P>", "<p>");
+			buffer.Replace("</P>", "</p>");
 
 			buffer.Replace("&amp;amp;", "&amp;");
 
@@ -101,6 +103,12 @@ namespace ScrewTurn.Wiki {
 			buffer.Replace("[", "&#91;");
 			buffer.Replace("]", "&#93;");
 
+			// #469: IE seems to randomly add this stuff
+			buffer.Replace("<p>&nbsp;</p>\r\n", "<br />");
+
+			buffer.Replace("<p>", "");
+			buffer.Replace("</p>", "");
+
 			// Temporarily replace <br /> in <pre> tags
 			match = PreRegex.Match(buffer.ToString());
 			while(match.Success) {
@@ -571,15 +579,7 @@ namespace ScrewTurn.Wiki {
 				match = BoxRegex.Match(buffer.ToString(), match.Index + 1);
 			}
 
-			buffer.Replace("<P>", "");
-			buffer.Replace("</P>", "<br />");
-			buffer.Replace("<p>", "");
-			buffer.Replace("</p>", "<br />");
-
 			// <br />
-			//sb.Replace("<br /><br />", "\r\n\r\n");
-			//sb.Replace("\r\n<br />", "\r\n\r\n");
-			//sb.Replace("<br />", "{BR}\r\n");
 			buffer.Replace("<br />", "\r\n");
 
 			// Fix line breaks in IE