Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

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/navbar.html b/webcit/static/t/navbar.html
index 9010d22d2400e4dca9e6c325842937aa51db6035..453759cefe490dd2029c848728185032e860e730 100644 (file)
--- a/webcit/static/t/navbar.html
+++ b/webcit/static/t/navbar.html
@@ -127,7 +127,7 @@
 <?!("COND:THISROOM:CURR_VIEW", 80, #"VIEW_WIKI")>
         <??("COND:WIKI:PAGE", 81, "home")>
        <li class="readallmess">
-               <a href="wiki?page=home">
+               <a href="wiki?page=home?go=<?ROOM:INFO:PRINT_NAME("U")>">
                        <img src="static/webcit_icons/essen/16x16/readallmsg.png" alt="" width="16" height="16">
                        <span class="navbar_link"><?_("Wiki home")></span>
                </a>

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")>

diff --git a/webcit/wiki.c b/webcit/wiki.c
index c72dbf656a726508f00c3f87d0b3893b1d33933e..47af67ec4170f276b06deb8cb6c30d14694c1c3b 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),