From: Wilfried Göesgens <willi@citadel.org>
Date: Tue, 24 Aug 2010 20:35:29 +0000 (+0000)
Subject: * work on the wiki parts of the navbar
X-Git-Tag: v8.01~852
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=2d69a82e8c483a33d5857f2ddf91caa79160ba55

* work on the wiki parts of the navbar
---

diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index 70372820f..121f69d6b 100644
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -141,7 +141,7 @@
 			</li>
 	<??("X", 82)>
 		<li class="newmess">
-			<a href="wiki<?%("COND:WIKI:TYPE", 84, "wiki_history", "wut?", "", "_history")><?BSTR:FORWARD("page", "U")>">
+			<a href="wiki<?%("COND:WIKI:TYPE", 84, "wiki_history", "wiki_history", "", "_history")><?BSTR:FORWARD("page", "U")>">
 				<img  src="static/newmess3_24x.gif" alt="" width="24" height="24">
 				<span class="navbar_link"><?%("COND:WIKI:TYPE", 86, "wiki_history", "wut?", '_("Current version")', '_("History")')></span>
 			</a>
diff --git a/webcit/wiki.c b/webcit/wiki.c
index 141c7f578..1bdd8c55d 100644
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -346,11 +346,12 @@ int ConditionalHaveWikiPage(StrBuf *Target, WCTemplputParams *TP)
 int ConditionalHavewikiType(StrBuf *Target, WCTemplputParams *TP)
 {
 	wcsession *WCC = WC;
+	const char *pch;
+	long len;
 
-	return 1;
+	GetTemplateTokenString(TP, &pch, &len, 2);
+	return bmstrcasestr((char *)ChrPtr(WCC->Hdr->HR.ReqLine), pch);
 }
-
-
 void 
 InitModule_WIKI
 (void)