changeset 3457:836d1706a5fe

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 30 Mar 2008 22:47:15 +0200
parents 8a1992a68cbf (current diff) f0aaecb1a44d (diff)
children 4f49f6e762a8
files
diffstat 4 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/macro/_tests/test_StatsChart.py	Sun Mar 30 22:26:05 2008 +0200
+++ b/MoinMoin/macro/_tests/test_StatsChart.py	Sun Mar 30 22:47:15 2008 +0200
@@ -43,6 +43,7 @@
         p = Parser("##\n", self.request)
         p.formatter = Formatter(self.request)
         p.formatter.page = self.page
+        self.request.page = self.page
         self.request.formatter = p.formatter
         p.form = self.request.form
         m = macro.Macro(p)
--- a/MoinMoin/parser/_tests/test_text_csv.py	Sun Mar 30 22:26:05 2008 +0200
+++ b/MoinMoin/parser/_tests/test_text_csv.py	Sun Mar 30 22:47:15 2008 +0200
@@ -34,6 +34,7 @@
         formatter = HtmlFormatter(request)
         formatter.setPage(page)
         page.formatter = formatter
+        request.page = page
         request.formatter = formatter
         parser = CSV_Parser(body, request, line_anchors=False)
         formatter.startContent('') # needed for _include_stack init
--- a/MoinMoin/script/maint/makecache.py	Sun Mar 30 22:26:05 2008 +0200
+++ b/MoinMoin/script/maint/makecache.py	Sun Mar 30 22:47:15 2008 +0200
@@ -43,5 +43,7 @@
         # make cache related to pagelinks entries of a page
         pages = request.rootpage.getPageList(user='', exists=1)
         for pagename in pages:
-            p = Page(request, pagename).getPageLinks(request)
+            page = Page(request, pagename)
+            request.page = page
+            p = page.getPageLinks(request)
 
--- a/MoinMoin/widget/browser.py	Sun Mar 30 22:26:05 2008 +0200
+++ b/MoinMoin/widget/browser.py	Sun Mar 30 22:47:15 2008 +0200
@@ -97,7 +97,7 @@
         fmt = self.request.formatter
 
         result = []
-        result.append(fmt.rawHTML('<form action="%s/%s" method="GET" name="%sform">' % (self.request.getScriptname(), wikiutil.quoteWikinameURL(fmt.page.page_name), self.data_id)))
+        result.append(fmt.rawHTML('<form action="%s/%s" method="GET" name="%sform">' % (self.request.getScriptname(), wikiutil.quoteWikinameURL(self.request.page.page_name), self.data_id)))
         result.append(fmt.div(1))
 
         havefilters = False