* re-enable drafts as proposed by samjam.

diff --git a/citadel/euidindex.c b/citadel/euidindex.c
index 842fa1d782af43257535c8dfe1784441f8c7b281..8ca39ee0e18e7588504af32b365932475c1c6710 100644 (file)
--- a/citadel/euidindex.c
+++ b/citadel/euidindex.c
@@ -69,6 +69,7 @@ int DoesThisRoomNeedEuidIndexing(struct ctdlroom *qrbuf) {
                case VIEW_BBS:          return(0);
                case VIEW_MAILBOX:      return(0);
                case VIEW_ADDRESSBOOK:  return(1);
+               case VIEW_DRAFTS:       return(0);
                case VIEW_CALENDAR:     return(1);
                case VIEW_TASKS:        return(1);
                case VIEW_NOTES:        return(1);

diff --git a/citadel/user_ops.c b/citadel/user_ops.c
index 2f23c3875cc6e710acd8c0ae4247f68bd5961a2b..d68d3345bcf4a592fb0cb6a87238cc2c9911d647 100644 (file)
--- a/citadel/user_ops.c
+++ b/citadel/user_ops.c
@@ -739,7 +739,7 @@ void do_login(void)
        CtdlCreateRoom(MAILROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
        CtdlCreateRoom(SENTITEMS, 4, "", 0, 1, 0, VIEW_MAILBOX);
        CtdlCreateRoom(USERTRASHROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
-       /* CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX); temporarily disabled for 7.60 */
+       CtdlCreateRoom(USERDRAFTROOM, 4, "", 0, 1, 0, VIEW_MAILBOX);
 
        /* Run any startup routines registered by loadable modules */
        PerformSessionHooks(EVT_LOGIN);

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index 600dd676ae7a9e10a7671b06a4594183b2783787..7febb91f49c809d753cdefe610703cc5d91d478a 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -14,10 +14,8 @@
 <?!("COND:BSTR", 1, "__RCPTREQUIRED")><input type="submit" name="send_button" value="<?_("Send message")>"><?!("X", 1)>
 <??("COND:BSTR", 2, "__RCPTREQUIRED")><input type="submit" name="send_button" value="<?_("Post message")>"><?!("X", 2)>
 &nbsp;
-<!-- temporarily disabled for 7.60
   <input type="submit" name="save_button" value="<?_("Save to Drafts")>">
 &nbsp;
--->
   <input type="submit" name="cancel_button" value="<?_("Cancel")>">
 </p>
 <img src="static/newmess3_24x.gif" class="imgedit">  <?DATE:NOW:STR>

diff --git a/webcit/static/t/view_message.html b/webcit/static/t/view_message.html
index aa2150ef00d559e221139cd9ba63685327a0dc06..941f98b9e79446e38bbef97aa7df90c43a2df731 100644 (file)
--- a/webcit/static/t/view_message.html
+++ b/webcit/static/t/view_message.html
@@ -16,9 +16,7 @@ onMouseOut=document.getElementById("msg<?MAIL:SUMM:N>").style.visibility="hidden
 <?!("COND:MAIL:SUMM:CCCC", 6)><?_("CC:")><?MAIL:SUMM:CCCC("X")><??("X", 6)>
 <?!("COND:MAIL:SUBJ", 7)><p class="message_subject"><?_("Subject:")> <?MAIL:SUMM:SUBJECT("X")></p><??("X", 7)>
  <p style="visibility: hidden;" id="msg<?MAIL:SUMM:N>" class="msgbuttons">
-<!-- temporarily disabled for 7.60
  <a href="display_enter?edit=<?MAIL:SUMM:N>&recp=<?MAIL:SUMM:TO("U")>&cc=<?MAIL:SUMM:CCCC("U")>&subject=<?MAIL:SUMM:SUBJECT("U", 0, "", "")>&force_room=_MAIL_"><span>[</span><?_("Edit")><span>]</span></a> 
--->
 <?!("COND:ROOM:TYPE_IS", 8, #"VIEW_BBS")>
    <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("Reply")><span>]</span></a> 
    <a href="display_enter?references=<?MAIL:SUMM:REFIDS("U")>%7C<?MAIL:SUMM:INREPLYTO("U")>?replyquote=<?MAIL:SUMM:N>&recp=%22<?MAIL:SUMM:FROM("U")>%22%3C<?MAIL:SUMM:RFCA("U")>%3E?subject=<?MAIL:SUMM:SUBJECT("U", 0, "Re: ", "Re:")>"><span>[</span><?_("ReplyQuoted")><span>]</span></a>