--- MoinMoin/macro/MonthCalendar.py	2010-07-03 12:28:37.848172684 +0200
+++ wiki/data/plugin/macro/MonthCalendar.py	2010-08-23 13:03:40.346298099 +0200
@@ -268,11 +268,11 @@
     p = Page(request, thispage)
     qpagenames = '*'.join([wikiutil.quoteWikinameURL(pn) for pn in parmpagename])
     qtemplate = wikiutil.quoteWikinameURL(parmtemplate)
-    querystr = "calparms=%%s,%d,%d,%d,%%d,,,%%s" % (parmyear, parmmonth, parmoffset)
-    prevlink = p.url(request, querystr % (qpagenames, parmoffset2 - 1, qtemplate))
-    nextlink = p.url(request, querystr % (qpagenames, parmoffset2 + 1, qtemplate))
-    prevylink = p.url(request, querystr % (qpagenames, parmoffset2 - 12, qtemplate))
-    nextylink = p.url(request, querystr % (qpagenames, parmoffset2 + 12, qtemplate))
+    querystr = "?calparms=%%s,%d,%d,%d,%%d,,,%%s" % (parmyear, parmmonth, parmoffset)
+    prevlink =  querystr % (qpagenames, parmoffset2 - 1, qtemplate)
+    nextlink = querystr % (qpagenames, parmoffset2 + 1, qtemplate)
+    prevylink = querystr % (qpagenames, parmoffset2 - 12, qtemplate)
+    nextylink = querystr % (qpagenames, parmoffset2 + 12, qtemplate)
 
     prevmonth = formatter.url(1, prevlink, 'cal-link', **attrs) + '<' + formatter.url(0)
     nextmonth = formatter.url(1, nextlink, 'cal-link', **attrs) + '>' + formatter.url(0)