TEMPLATING: add possibility to stack another context inbetween conditional tags

[citadel.git] / webcit / wiki.c

diff --git a/webcit/wiki.c b/webcit/wiki.c
index c72dbf656a726508f00c3f87d0b3893b1d33933e..c4a4ac7504adcb4b9136fd486af5afe025e487ea 100644 (file)
--- a/webcit/wiki.c
+++ b/webcit/wiki.c
@@ -170,11 +170,12 @@ void tmplput_display_wiki_history(StrBuf *Target, WCTemplputParams *TP)
                        }
 
                        else {
-                               wc_printf("<td><a href=\"wiki?page=%s?rev=%s\">%s</a></td>",
+                               wc_printf("<td><a href=\"wiki?page=%s?rev=%s",
                                        bstr("page"),
-                                       ChrPtr(rev_uuid),
-                                       _("(show)")
+                                       ChrPtr(rev_uuid)
                                );
+                               wc_printf("?go="); urlescputs(ChrPtr(WC->CurRoom.name));
+                               wc_printf("\">%s</a></td>", _("(show)"));
                                wc_printf("<td><a href=\"javascript:GetLoggedInFirst(encodeURIComponent('wiki?page=%s?rev=%s?revert=1'))\">%s</a></td>",
                                        bstr("page"),
                                        ChrPtr(rev_uuid),
@@ -351,6 +352,6 @@ InitModule_WIKI
        WebcitAddUrlHandler(HKEY("wiki_pagelist"), "", 0, display_wiki_pagelist, 0);
        RegisterNamespace("WIKI:DISPLAYHISTORY", 0, 0, tmplput_display_wiki_history, NULL, CTX_NONE);
        RegisterNamespace("WIKI:DISPLAYPAGELIST", 0, 0, tmplput_display_wiki_pagelist, NULL, CTX_NONE);
-       RegisterConditional(HKEY("COND:WIKI:PAGE"), 1, ConditionalHaveWikiPage, CTX_NONE);
-       RegisterConditional(HKEY("COND:WIKI:TYPE"), 1, ConditionalHavewikiType, CTX_NONE);
+       RegisterConditional("COND:WIKI:PAGE", 1, ConditionalHaveWikiPage, CTX_NONE);
+       RegisterConditional("COND:WIKI:TYPE", 1, ConditionalHavewikiType, CTX_NONE);
 }