changeset 1701:3c6f59cafbbe

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 21 Dec 2006 03:39:57 +0100
parents c54be3afb830 (current diff) 66f2ea899da7 (diff)
children 790c1e655a5b
files
diffstat 3 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/Page.py	Thu Dec 21 03:39:28 2006 +0100
+++ b/MoinMoin/Page.py	Thu Dec 21 03:39:57 2006 +0100
@@ -313,15 +313,15 @@
             return self.current_rev()
         return self.rev
 
-    def getPageBasePath(self, use_underlay):
+    def getPageBasePath(self, use_underlay=-1):
         """
         Get full path to a page-specific storage area. `args` can
         contain additional path components that are added to the base path.
 
-        @param use_underlay: force using a specific pagedir, default '-1'
-                                '-1' = automatically choose page dir
-                                '1' = use underlay page dir
-                                '0' = use standard page dir
+        @param use_underlay: force using a specific pagedir, default -1
+                                -1 = automatically choose page dir
+                                1 = use underlay page dir
+                                0 = use standard page dir
         @rtype: string
         @return: int underlay,
                  str the full path to the storage area
@@ -1598,15 +1598,16 @@
         page_name = u''
         Page.__init__(self, request, page_name)
 
-    def getPageBasePath(self, use_underlay):
+    def getPageBasePath(self, use_underlay=0):
         """
         Get full path to a page-specific storage area. `args` can
         contain additional path components that are added to the base path.
 
-        @param use_underlay: force using a specific pagedir, default '-1'
-                                '-1' = automatically choose page dir
-                                '1' = use underlay page dir
-                                '0' = use standard page dir
+        @param use_underlay: force using a specific pagedir, default 0:
+                                1 = use underlay page dir
+                                0 = use standard page dir
+                                Note: we do NOT have special support for -1
+                                      here, that will just behave as 0!
         @rtype: string
         @return: int underlay,
                  str the full path to the storage area
--- a/MoinMoin/action/fckdialog.py	Thu Dec 21 03:39:28 2006 +0100
+++ b/MoinMoin/action/fckdialog.py	Thu Dec 21 03:39:57 2006 +0100
@@ -246,7 +246,6 @@
         scriptname += "/"
     action = scriptname
     basepage = request.page.page_name.encode(config.charset)
-    request.emit_http_headers()
     request.write('''
 <!--
  * FCKeditor - The text editor for internet
@@ -397,7 +396,6 @@
     if not scriptname or scriptname[-1] != "/":
         scriptname += "/"
     action = scriptname
-    request.emit_http_headers()
     request.write('''
 <!--
  * FCKeditor - The text editor for internet
--- a/MoinMoin/request/__init__.py	Thu Dec 21 03:39:28 2006 +0100
+++ b/MoinMoin/request/__init__.py	Thu Dec 21 03:39:57 2006 +0100
@@ -1188,9 +1188,10 @@
 
         # Send headers only once
         sent_headers = getattr(self, 'sent_headers', 0)
-        self.sent_headers = sent_headers + 1
-        if sent_headers:
-            raise HeadersAlreadySentException("emit_http_headers called multiple (%d) times! Headers: %r" % (sent_headers, headers))
+        sent_headers += 1
+        self.sent_headers = sent_headers
+        if sent_headers > 1:
+            raise HeadersAlreadySentException("emit_http_headers called multiple (%d) times! Headers: %r" % (sent_headers, all_headers))
         #else:
         #    self.log("Notice: emit_http_headers called first time. Headers: %r" % all_headers)