zydronium/screwturn-4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed regression introduced with fix to regression introduced with fix to #305.

Browse source
This commit is contained in:
Dario Solera 2009-10-22 15:45:13 +00:00
parent 0edaac7132
commit c135c883fe
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Core-Tests/FormatterTests.cs
View file

@ -93,8 +93,8 @@ second line@@
private const string ExpectedOutput = private const string ExpectedOutput =
@"<b>bold</b> <i>italic</i> <u>underlined</u> <strike>striked</strike> @"<b>bold</b> <i>italic</i> <u>underlined</u> <strike>striked</strike>
<a class=""pagelink"" href=""page1.ashx"" title=""Page 1"">page1</a> <a class=""unknownlink"" href=""page2.ashx"" title=""page2"">title</a><br /><br /><pre>&#0042; item 1 <a class=""pagelink"" href=""page1.ashx"" title=""Page 1"">page1</a> <a class=""unknownlink"" href=""page2.ashx"" title=""page2"">title</a><br /><br /><pre>&#42; item 1
&#0042; item 2 &#42; item 2
second line</pre><br /><table><tr><td>cell</td><td>other cell</td></tr></table> second line</pre><br /><table><tr><td>cell</td><td>other cell</td></tr></table>
"; ";

4
Core/Formatter.cs
View file

@ -164,10 +164,10 @@ namespace ScrewTurn.Wiki {
sb.Remove(match.Index, match.Length); sb.Remove(match.Index, match.Length);
string content = match.Value.Substring(2, match.Length - 4); string content = match.Value.Substring(2, match.Length - 4);
dummy = new StringBuilder(); dummy = new StringBuilder();
dummy.Append("<nobr><pre>"); dummy.Append("<pre><nobr>");
// IE needs \r\n for line breaks // IE needs \r\n for line breaks
dummy.Append(EscapeWikiMarkup(content).Replace("\n", "\r\n")); dummy.Append(EscapeWikiMarkup(content).Replace("\n", "\r\n"));
dummy.Append("</pre></nobr>"); dummy.Append("</nobr></pre>");
sb.Insert(match.Index, dummy.ToString()); sb.Insert(match.Index, dummy.ToString());
} }
ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd); ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd);