From 63cbcbf7992bdf6e0b0eb04db4b92476a609d543 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 13 Nov 2009 04:12:25 +0000 Subject: [PATCH] * Renamed the 'wikipage' variable to 'page' in the enter message loop to make it identical to its corresponding variable in the read message loop. This allows the page name to be displayed in the room banner during editing. --- webcit/messages.c | 8 ++++---- webcit/msg_renderers.c | 2 +- webcit/roomops.c | 2 +- webcit/static/t/edit_message.html | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/webcit/messages.c b/webcit/messages.c index f3314a726..cd10b6a74 100644 --- a/webcit/messages.c +++ b/webcit/messages.c @@ -1143,7 +1143,7 @@ void post_message(void) Recp = sbstr("recp"); Cc = sbstr("cc"); Bcc = sbstr("bcc"); - Wikipage = sbstr("wikipage"); + Wikipage = sbstr("page"); my_email_addr = sbstr("my_email_addr"); CmdBuf = NewStrBufPlain(NULL, @@ -1230,8 +1230,8 @@ void post_message(void) /* * If we were editing a page in a wiki room, go to that page now. */ - else if (havebstr("wikipage")) { - snprintf(buf, sizeof buf, "wiki?page=%s", bstr("wikipage")); + else if (havebstr("page")) { + snprintf(buf, sizeof buf, "wiki?page=%s", bstr("page")); http_redirect(buf); } /* @@ -1332,7 +1332,7 @@ void display_enter(void) Recp = sbstr("recp"); Cc = sbstr("cc"); Bcc = sbstr("bcc"); - Wikipage = sbstr("wikipage"); + Wikipage = sbstr("page"); CmdBuf = NewStrBufPlain(NULL, sizeof (CMD) + diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c index 7fb9b98f5..5c029823e 100644 --- a/webcit/msg_renderers.c +++ b/webcit/msg_renderers.c @@ -809,7 +809,7 @@ void tmplput_EDIT_WIKI_BODY(StrBuf *Target, WCTemplputParams *TP) long msgnum; StrBuf *Buf; - msgnum = locate_message_by_uid(BSTR("wikipage")); + msgnum = locate_message_by_uid(BSTR("page")); if (msgnum >= 0L) { Buf = NewStrBuf(); read_message(Buf, HKEY("view_message_wikiedit"), msgnum, NULL, &Mime); diff --git a/webcit/roomops.c b/webcit/roomops.c index 7531b5923..a1b69f85b 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -656,7 +656,7 @@ void embed_room_banner(char *got, int navbar_style) { str_wiki_index(buf); wc_printf( "
  • " - "" + "" "" "" diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html index 45f4a5889..f0358e199 100644 --- a/webcit/static/t/edit_message.html +++ b/webcit/static/t/edit_message.html @@ -8,7 +8,7 @@ "> "> -"> +">

    "> -- 2.30.2