* work on the wiki parts of the navbar

diff --git a/webcit/static/t/navbar.html b/webcit/static/t/navbar.html
index 70372820f16c1f218a82ca322af70afd5af1dcb8..121f69d6bab6aca9a7321df63339e17685a78e6d 100644 (file)
--- 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 141c7f578bbeaf326c07476f3943e652dbc90a9c..1bdd8c55da104b3419b9bc208f4e5403456f2569 100644 (file)
--- 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)