From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 24 Apr 2012 18:27:06 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
X-Git-Tag: v8.11~67
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=94ef7564c4585129c6025debe797c8dade2e6885;hp=d7e16fba696d75111a03e335c98219e4ad3b5704;p=citadel.git

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

diff --git a/webcit/html2html.c b/webcit/html2html.c
index 659f454c3..acc781661 100644
--- 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 9010d22d2..453759cef 100644
--- 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 060ce854d..1ffa2432f 100644
--- 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 c72dbf656..47af67ec4 100644
--- 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),