* Renamed the 'wikipage' variable to 'page' in the enter message loop to make it...

diff --git a/webcit/messages.c b/webcit/messages.c
index f3314a72685fe04c1012142e07db6e178b74984d..cd10b6a74091279cb7f603d78e7ad9b4f601b2ae 100644 (file)
--- 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 7fb9b98f5a4c890eeb59b75f5b8320aeecdfa86b..5c029823e085dbed1162a10758f9a5b7cdcfd535 100644 (file)
--- 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 7531b59239b23eec45ee919e22b53b00739388d0..a1b69f85b505495e8db3887770c7425fdcd36961 100644 (file)
--- 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(
                                        "<li class=\"newmess\">"
-                                       "<a href=\"display_enter?wikipage=%s\">"
+                                       "<a href=\"display_enter?page=%s\">"
                                        "<img  src=\"static/newmess3_24x.gif\" "
                                        "alt=\"\" width=\"24\" height=\"24\">"
                                        "<span class=\"navbar_link\">"

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index 45f4a5889d28154fde3ca6bab578df71ceb8f7fd..f0358e1992cf8a8f4075ddbe6632d7bc1f59d93b 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -8,7 +8,7 @@
 <input type="hidden" name="nonce" value="<?NONCE>">
 <input type="hidden" name="force_room" value="<?ROOMNAME("X")>">
 <input type="hidden" name="references" value="<?BSTR("references")>">
-<input type="hidden" name="wikipage" value="<?BSTR("wikipage")>">
+<input type="hidden" name="page" value="<?BSTR("page")>">
 
 <p class="send_edit_msg">
 <?!("COND:SUBST", 1, "RCPTREQUIRED")><input type="submit" name="send_button" value="<?_("Send message")>"><?!("X", 1)>