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

Fixed and closed #499 : SpecialTagRegex is not processed if Format is called with forIndexing=true.

Browse source
This commit is contained in:
Matteo Tomasini 2010-04-09 14:56:34 +00:00
parent bb4229e60a
commit acfc1ad983
2 changed files with 70 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

4
AssemblyVersion.cs
View file

@ -16,5 +16,5 @@ using System.Reflection;
// //
// You can specify all the values or you can default the Revision and Build Numbers // You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
[assembly: AssemblyVersion("3.0.2.531")] [assembly: AssemblyVersion("3.0.2.532")]
[assembly: AssemblyFileVersion("3.0.2.531")] [assembly: AssemblyFileVersion("3.0.2.532")]

4
Core/Formatter.cs
View file

@ -278,6 +278,7 @@ namespace ScrewTurn.Wiki {
while(match.Success) { while(match.Success) {
if(!IsNoWikied(match.Index, noWikiBegin, noWikiEnd, out end)) { if(!IsNoWikied(match.Index, noWikiBegin, noWikiEnd, out end)) {
sb.Remove(match.Index, match.Length); sb.Remove(match.Index, match.Length);
if(!forIndexing) {
switch(match.Value.Substring(1, match.Value.Length - 2).ToUpperInvariant()) { switch(match.Value.Substring(1, match.Value.Length - 2).ToUpperInvariant()) {
case "WIKITITLE": case "WIKITITLE":
sb.Insert(match.Index, Settings.WikiTitle); sb.Insert(match.Index, Settings.WikiTitle);
@ -337,7 +338,7 @@ namespace ScrewTurn.Wiki {
sb.Insert(match.Index, Pages.GetGlobalPageCount().ToString()); sb.Insert(match.Index, Pages.GetGlobalPageCount().ToString());
break; break;
case "ORPHANS": case "ORPHANS":
if(!forIndexing) sb.Insert(match.Index, BuildOrphanedPagesList(DetectNamespaceInfo(current), context, current)); sb.Insert(match.Index, BuildOrphanedPagesList(DetectNamespaceInfo(current), context, current));
break; break;
case "WANTED": case "WANTED":
sb.Insert(match.Index, BuildWantedPagesList(DetectNamespaceInfo(current))); sb.Insert(match.Index, BuildWantedPagesList(DetectNamespaceInfo(current)));
@ -347,6 +348,7 @@ namespace ScrewTurn.Wiki {
break; break;
} }
} }
}
ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd); ComputeNoWiki(sb.ToString(), ref noWikiBegin, ref noWikiEnd);
match = SpecialTagRegex.Match(sb.ToString(), end); match = SpecialTagRegex.Match(sb.ToString(), end);
} }