diff --git a/AssemblyVersion.cs b/AssemblyVersion.cs index 4af0c08..1046a76 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.476")] -[assembly: AssemblyFileVersion("3.0.1.476")] +[assembly: AssemblyVersion("3.0.1.477")] +[assembly: AssemblyFileVersion("3.0.1.477")] diff --git a/Core/Formatter.cs b/Core/Formatter.cs index e0b507a..1039906 100644 --- a/Core/Formatter.cs +++ b/Core/Formatter.cs @@ -36,7 +36,7 @@ namespace ScrewTurn.Wiki { private static readonly Regex BoxRegex = new Regex(@"\(\(\(.+?\)\)\)", RegexOptions.Compiled | RegexOptions.Singleline); private static readonly Regex ExtendedUpRegex = new Regex(@"\{up((\:|\().+?)?\}", RegexOptions.Compiled | RegexOptions.IgnoreCase); //private static readonly Regex UpRegex = new Regex(@"\{up\}", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly Regex SpecialTagRegex = new Regex(@"\{(wikititle|wikiversion|mainurl|rsspage|themepath|clear|br|top|searchbox|pagecount|cloud|orphans|wanted|namespacelist)\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); + private static readonly Regex SpecialTagRegex = new Regex(@"\{(wikititle|wikiversion|mainurl|rsspage|themepath|clear|br|top|searchbox|pagecount|pagecount\(\*\)|cloud|orphans|wanted|namespacelist)\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); //private static readonly Regex CloudRegex = new Regex(@"\{cloud\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); //private static readonly Regex NamespaceRegex = new Regex(@"\{namespace\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); //private static readonly Regex NamespaceListRegex = new Regex(@"\{namespacelist\}", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant); @@ -329,6 +329,9 @@ namespace ScrewTurn.Wiki { case "PAGECOUNT": sb.Insert(match.Index, Pages.GetPages(DetectNamespaceInfo(current)).Count.ToString()); break; + case "PAGECOUNT(*)": + sb.Insert(match.Index, Pages.GetGlobalPageCount().ToString()); + break; case "ORPHANS": if(!forIndexing) sb.Insert(match.Index, BuildOrphanedPagesList(DetectNamespaceInfo(current), context, current)); break;