Added more 'go=' parameters to links in the wiki view, thereby making those links...

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 659f454c33e409c6c0a5521bd68a70fca3a1ffcd..acc78166114366c785a0f5bf0b2c375badad1b5e 100644 (file)
--- a/webcit/html2html.c
+++ b/webcit/html2html.c
@@ -400,7 +400,9 @@ void output_html(const char *supplied_charset, int treat_as_wiki, int msgnum, St
                                && (strncasecmp(ptr, "<a href=\"knrooms?", 17))
                        ) {
                                content_length += 64;
-                               StrBufAppendPrintf(converted_msg, "<a href=\"wiki?page=");
+                               StrBufAppendPrintf(converted_msg, "<a href=\"wiki?go=");
+                               StrBufUrlescAppend(converted_msg, WC->CurRoom.name, NULL);
+                               StrBufAppendPrintf(converted_msg, "?page=");
                                ptr = &ptr[9];
                        }
                        else {

diff --git a/webcit/static/t/roombanner.html b/webcit/static/t/roombanner.html
index 060ce854d858cdb59c8450f941e25737fccedffd..1ffa2432fffd23649e679a844f20122ae9bacaf1 100644 (file)
--- a/webcit/static/t/roombanner.html
+++ b/webcit/static/t/roombanner.html
@@ -6,7 +6,7 @@
                <td>
                        <h1 id="rmname"><a href="/readnew?go=<?ROOM:INFO:PRINT_NAME("U")>"><?ROOM:INFO:PRINT_NAME("X")></a></h1>
                        <?THISROOM:FEED:RSS>
-                       <?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")><h2><?BSTR("page")></h2><?!("X", 7)>
+                       <?!("COND:ROOM:TYPE_IS", 7, #"VIEW_WIKI")><h2><a href="wiki?go=<?ROOM:INFO:PRINT_NAME("U")>?page=<?BSTR("page")>"><?BSTR("page")></a></h2><?!("X", 7)>
                        <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_BBS")><p id="nummsgs"><?THISROOM:MSGS:NEW> <?_("new of")> <?THISROOM:MSGS:TOTAL> <?_("messages")></p><?!("X", 8)>
                        <?!("COND:ROOM:TYPE_IS", 11, #"VIEW_MAILBOX")><p id="nummsgs"><?THISROOM:MSGS:NEW> <?_("new of")> <?THISROOM:MSGS:TOTAL> <?_("messages")></p><?!("X", 11)>
                        <?!("COND:THISROOM:FLAG:QR", 9, #"QR_DIRECTORY")><?!("COND:THISROOM:FLAG:QR", 10, #"QR_VISDIR")>