1.1 --- a/actions/SendMessage.py Wed Jan 08 01:55:57 2014 +0100
1.2 +++ b/actions/SendMessage.py Thu Jan 09 16:52:05 2014 +0100
1.3 @@ -2,7 +2,7 @@
1.4 """
1.5 MoinMoin - SendMessage Action
1.6
1.7 - @copyright: 2012, 2013 by Paul Boddie <paul@boddie.org.uk>
1.8 + @copyright: 2012, 2013, 2014 by Paul Boddie <paul@boddie.org.uk>
1.9 @license: GNU GPL (v2 or later), see COPYING.txt for details.
1.10 """
1.11
1.12 @@ -11,7 +11,8 @@
1.13 from MoinMoin.log import getLogger
1.14 from MoinMoin.Page import Page
1.15 from MoinMoin import config
1.16 -from MoinMessage import GPG, MoinMessageError, Message, sendMessage, timestamp
1.17 +from MoinMessage import GPG, MoinMessageError, Message, sendMessage, timestamp, \
1.18 + as_string
1.19 from MoinMessageSupport import get_signing_users, get_recipients, get_relays, \
1.20 get_recipient_details, MoinMessageRecipientError
1.21 from MoinSupport import *
1.22 @@ -330,13 +331,13 @@
1.23 elif type == "page":
1.24 page = Page(request, location)
1.25 outbox = ItemStore(page, "messages", "message-locks")
1.26 - outbox.append(message.as_string())
1.27 + outbox.append(as_string(message))
1.28
1.29 # Or queue the message in a special outbox.
1.30
1.31 else:
1.32 outbox = ItemStore(request.page, "outgoing-messages", "outgoing-message-locks")
1.33 - outbox.append(message.as_string())
1.34 + outbox.append(as_string(message))
1.35
1.36 return 1, _("Message sent!")
1.37