changeset 5587:c68058eaa6be

merged moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 25 Feb 2010 16:52:28 +0100
parents 5835fd165996 (current diff) 369a2c879eb6 (diff)
children 4a50a70af35d 6f975bdd5adf
files MoinMoin/action/AttachFile.py
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/AttachFile.py	Thu Feb 25 14:02:44 2010 +0100
+++ b/MoinMoin/action/AttachFile.py	Thu Feb 25 16:52:28 2010 +0100
@@ -83,7 +83,12 @@
             and
             kw.get('rename') is None):
         # create a ticket for the not so harmless operations
-        kw['ticket'] = wikiutil.createTicket(request)
+        # we need action= here because the current action (e.g. "show" page
+        # with a macro AttachList) may not be the linked-to action, e.g.
+        # "AttachFile". Also, AttachList can list attachments of another page,
+        # thus we need to give pagename= also.
+        kw['ticket'] = wikiutil.createTicket(request,
+                                             pagename=pagename, action=action_name)
     if kw:
         qs = '?%s' % wikiutil.makeQueryString(kw, want_unicode=False)
     else: