diff MoinMoin/action/AttachFile.py @ 617:cf420addd95c

removed MoinMoinNoFooter at many places, added call to theme.send_closing_html() where needed
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 05 May 2006 13:31:08 +0200
parents 3b08d9413589
children 088282ae5cf3
line wrap: on
line diff
--- a/MoinMoin/action/AttachFile.py	Fri May 05 12:41:10 2006 +0200
+++ b/MoinMoin/action/AttachFile.py	Fri May 05 13:31:08 2006 +0200
@@ -29,7 +29,7 @@
 import os, mimetypes, time, zipfile
 from MoinMoin import config, user, util, wikiutil, packages
 from MoinMoin.Page import Page
-from MoinMoin.util import MoinMoinNoFooter, filesys
+from MoinMoin.util import filesys
 
 action_name = __name__.split('.')[-1]
 
@@ -507,7 +507,7 @@
     send_uploadform(pagename, request)
     request.write('</div>\n') # end content div
     request.theme.send_footer(pagename)
-
+    request.theme.send_closing_html()
 
 def do_upload(pagename, request):
     _ = request.getText
@@ -650,8 +650,6 @@
     # send data
     shutil.copyfileobj(open(fpath, 'rb'), request, 8192)
 
-    raise MoinMoinNoFooter
-
 def install_package(pagename, request):
     _ = request.getText
 
@@ -826,9 +824,8 @@
     send_uploadform(pagename, request)
     request.write('</div>\n') # end content div
 
-    # send footer
     request.theme.send_footer(pagename)
-
+    request.theme.send_closing_html()
 
 #############################################################################
 ### File attachment administration