changeset 3234:a739558ca3dc

Page.url() default changed to relative=False
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 10 Mar 2008 00:21:21 +0100
parents 5e120e903ad5
children 4c0121050056
files MoinMoin/Page.py MoinMoin/action/CopyPage.py MoinMoin/action/Load.py MoinMoin/action/RenamePage.py MoinMoin/action/RenderAsDocbook.py MoinMoin/action/__init__.py MoinMoin/action/diff.py MoinMoin/action/fullsearch.py MoinMoin/action/newaccount.py MoinMoin/action/newpage.py MoinMoin/action/rss_rc.py MoinMoin/action/serveopenid.py MoinMoin/action/sisterpages.py MoinMoin/action/sitemap.py MoinMoin/action/supplementation.py MoinMoin/action/userprefs.py MoinMoin/auth/__init__.py MoinMoin/events/emailnotify.py MoinMoin/events/jabbernotify.py MoinMoin/events/notification.py MoinMoin/macro/Action.py MoinMoin/macro/Include.py MoinMoin/macro/MonthCalendar.py MoinMoin/macro/__init__.py MoinMoin/parser/text_moin_wiki.py MoinMoin/parser/text_rst.py MoinMoin/request/__init__.py MoinMoin/search/results.py MoinMoin/theme/__init__.py MoinMoin/userprefs/__init__.py MoinMoin/userprefs/oid.py MoinMoin/xmlrpc/__init__.py docs/CHANGES
diffstat 33 files changed, 59 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/Page.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/Page.py	Mon Mar 10 00:21:21 2008 +0100
@@ -746,7 +746,7 @@
         splitted = config.split_regex.sub(r'\1 \2', self.page_name)
         return splitted
 
-    def url(self, request, querystr=None, anchor=None, relative=True, **kw):
+    def url(self, request, querystr=None, anchor=None, relative=False, **kw):
         """ Return complete URL for this page, including scriptname.
             The URL is NOT escaped, if you write it to HTML, use wikiutil.escape
             (at least if you have a querystr, to escape the & chars).
@@ -755,6 +755,8 @@
         @param querystr: the query string to add after a "?" after the url
             (str or dict, see wikiutil.makeQueryString)
         @param anchor: if specified, make a link to this anchor
+        @param relative: create a relative link (default: False), note that this
+                         changed in 1.7, in 1.6, the default was True.
         @rtype: str
         @return: complete url of this page, including scriptname
         """
@@ -1153,21 +1155,17 @@
                       request.dicts.has_member(request.cfg.openid_server_restricted_users_group, openid_username):
                         html_head = '<link rel="openid2.provider" href="%s">' % \
                                         wikiutil.escape(request.getQualifiedURL(self.url(request,
-                                                                                querystr={'action': 'serveopenid'},
-                                                                                relative=False)))
+                                                                                querystr={'action': 'serveopenid'})))
                         html_head += '<link rel="openid.server" href="%s">' % \
                                         wikiutil.escape(request.getQualifiedURL(self.url(request,
-                                                                                querystr={'action': 'serveopenid'},
-                                                                                relative=False)))
+                                                                                querystr={'action': 'serveopenid'})))
                         html_head += '<meta http-equiv="x-xrds-location" content="%s">' % \
                                         wikiutil.escape(request.getQualifiedURL(self.url(request,
-                                                                                querystr={'action': 'serveopenid', 'yadis': 'ep'},
-                                                                                relative=False)))
+                                                                                querystr={'action': 'serveopenid', 'yadis': 'ep'})))
                     elif self.page_name == request.cfg.page_front_page:
                         html_head = '<meta http-equiv="x-xrds-location" content="%s">' % \
                                         wikiutil.escape(request.getQualifiedURL(self.url(request,
-                                                                                querystr={'action': 'serveopenid', 'yadis': 'idp'},
-                                                                                relative=False)))
+                                                                                querystr={'action': 'serveopenid', 'yadis': 'idp'})))
 
                 request.theme.send_title(title, page=self,
                                     print_mode=print_mode,
--- a/MoinMoin/action/CopyPage.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/CopyPage.py	Mon Mar 10 00:21:21 2008 +0100
@@ -73,7 +73,7 @@
 
     def do_action_finish(self, success):
         if success:
-            url = Page(self.request, self.newpagename).url(self.request, relative=False)
+            url = Page(self.request, self.newpagename).url(self.request)
             self.request.http_redirect(url)
             self.request.finish()
         else:
--- a/MoinMoin/action/Load.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/Load.py	Mon Mar 10 00:21:21 2008 +0100
@@ -101,7 +101,7 @@
 
     def do_action_finish(self, success):
         if success:
-            url = Page(self.request, self.pagename).url(self.request, relative=False)
+            url = Page(self.request, self.pagename).url(self.request)
             self.request.http_redirect(url)
             self.request.finish()
         else:
--- a/MoinMoin/action/RenamePage.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/RenamePage.py	Mon Mar 10 00:21:21 2008 +0100
@@ -72,7 +72,7 @@
 
     def do_action_finish(self, success):
         if success:
-            url = Page(self.request, self.newpagename).url(self.request, relative=False)
+            url = Page(self.request, self.newpagename).url(self.request)
             self.request.http_redirect(url)
             self.request.finish()
         else:
--- a/MoinMoin/action/RenderAsDocbook.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/RenderAsDocbook.py	Mon Mar 10 00:21:21 2008 +0100
@@ -8,6 +8,6 @@
 from MoinMoin.Page import Page
 
 def execute(pagename, request):
-    url = Page(request, pagename).url(request, {'action': 'show', 'mimetype': 'text/docbook'}, relative=False)
+    url = Page(request, pagename).url(request, {'action': 'show', 'mimetype': 'text/docbook'})
     request.http_redirect(url)
 
--- a/MoinMoin/action/__init__.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/__init__.py	Mon Mar 10 00:21:21 2008 +0100
@@ -287,7 +287,7 @@
 def do_goto(pagename, request):
     """ redirect to another page """
     target = request.form.get('target', [''])[0]
-    request.http_redirect(Page(request, target).url(request, relative=False))
+    request.http_redirect(Page(request, target).url(request))
 
 # Dispatching ----------------------------------------------------------------
 def getNames(cfg):
--- a/MoinMoin/action/diff.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/diff.py	Mon Mar 10 00:21:21 2008 +0100
@@ -120,7 +120,7 @@
     else:
         disable_next = u''
 
-    page_url = wikiutil.escape(currentpage.url(request, relative=False))
+    page_url = wikiutil.escape(currentpage.url(request))
 
     navigation_html = """
 <table class="diff">
--- a/MoinMoin/action/fullsearch.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/fullsearch.py	Mon Mar 10 00:21:21 2008 +0100
@@ -202,7 +202,7 @@
                 querydict = {'highlight': highlight}
             else:
                 querydict = {}
-            url = page.url(request, querystr=querydict, relative=False)
+            url = page.url(request, querystr=querydict)
             request.http_redirect(url)
             return
     elif not results.hits: # no hits?
@@ -216,8 +216,7 @@
                     titlesearch and ''.join([
                         '<br>',
                         _('(!) Consider performing a', wiki=True), ' ',
-                        f.url(1, href=request.page.url(request, querydict,
-                            escape=0, relative=False)),
+                        f.url(1, href=request.page.url(request, querydict, escape=0)),
                         _('full-text search with your search terms'),
                         f.url(0), '.',
                     ]) or ''), "error")
@@ -247,8 +246,7 @@
             _("(!) You're performing a title search that might not include"
                 ' all related results of your search query in this wiki. <<BR>>', wiki=True),
             ' ',
-            f.url(1, href=request.page.url(request, querydict, escape=0,
-                relative=False)),
+            f.url(1, href=request.page.url(request, querydict, escape=0)),
             f.text(_('Click here to perform a full-text search with your '
                 'search terms!')),
             f.url(0),
--- a/MoinMoin/action/newaccount.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/newaccount.py	Mon Mar 10 00:21:21 2008 +0100
@@ -93,7 +93,7 @@
 
 def _create_form(request):
     _ = request.getText
-    url = request.page.url(request, relative=False)
+    url = request.page.url(request)
     ret = html.FORM(action=url)
     ret.append(html.INPUT(type='hidden', name='action', value='newaccount'))
     lang_attr = request.theme.ui_lang_attr()
--- a/MoinMoin/action/newpage.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/newpage.py	Mon Mar 10 00:21:21 2008 +0100
@@ -90,7 +90,7 @@
             if parent:
                 pagename = "%s/%s" % (parent, pagename)
 
-            url = Page(self.request, pagename).url(self.request, query, relative=False)
+            url = Page(self.request, pagename).url(self.request, query)
             self.request.http_redirect(url)
 
         return ''
--- a/MoinMoin/action/rss_rc.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/rss_rc.py	Mon Mar 10 00:21:21 2008 +0100
@@ -16,7 +16,7 @@
 from MoinMoin.wikixml.util import RssGenerator
 
 def full_url(request, page, querystr=None, anchor=None):
-    url = page.url(request, relative=False, anchor=anchor, querystr=querystr)
+    url = page.url(request, anchor=anchor, querystr=querystr)
     url = wikiutil.escape(url)
     return request.getQualifiedURL(url)
 
--- a/MoinMoin/action/serveopenid.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/serveopenid.py	Mon Mar 10 00:21:21 2008 +0100
@@ -34,7 +34,7 @@
         hdrs = ['Content-type: application/xrds+xml']
 
         request.emit_http_headers(hdrs)
-        user_url = request.getQualifiedURL(request.page.url(request, relative=False))
+        user_url = request.getQualifiedURL(request.page.url(request))
         self.request.write("""\
 <?xml version="1.0" encoding="UTF-8"?>
 <xrds:XRDS
@@ -82,7 +82,7 @@
         hdrs = ['Content-type: application/xrds+xml']
 
         request.emit_http_headers(hdrs)
-        user_url = request.getQualifiedURL(request.page.url(request, relative=False))
+        user_url = request.getQualifiedURL(request.page.url(request))
         self.request.write("""\
 <?xml version="1.0" encoding="UTF-8"?>
 <xrds:XRDS
@@ -137,7 +137,7 @@
         # For the #OpenIDUser PI, we need to allow the page that includes the PI,
         # hence use check_name here (see above for how it is assigned)
         fullidentity = '/'.join([base, check_name])
-        thisurl = request.getQualifiedURL(request.page.url(request, relative=False))
+        thisurl = request.getQualifiedURL(request.page.url(request))
         if not thisurl == fullidentity:
             return False
 
@@ -165,10 +165,8 @@
         page = wikiutil.getHomePage(self.request)
         if page:
             server_url = self.request.getQualifiedURL(
-                             page.url(self.request,
-                                      querystr={'action': 'serveopenid'},
-                                      relative=False))
-            identity = self.request.getQualifiedURL(page.url(self.request, relative=False))
+                             page.url(self.request, querystr={'action': 'serveopenid'}))
+            identity = self.request.getQualifiedURL(page.url(self.request))
             return identity, server_url
         return None, None
 
@@ -190,9 +188,7 @@
             return
 
         server_url = request.getQualifiedURL(
-                         request.page.url(request,
-                                          querystr={'action': 'serveopenid'},
-                                          relative=False))
+                         request.page.url(request, querystr={'action': 'serveopenid'}))
 
         yadis_type = form.get('yadis', [None])[0]
         if yadis_type == 'ep':
--- a/MoinMoin/action/sisterpages.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/sisterpages.py	Mon Mar 10 00:21:21 2008 +0100
@@ -62,5 +62,5 @@
         pages.sort()
         for pn in pages:
             p = Page(request, pn)
-            entry = u"%s %s\r\n" % (request.getQualifiedURL(p.url(request, relative=False)), p.page_name)
+            entry = u"%s %s\r\n" % (request.getQualifiedURL(p.url(request)), p.page_name)
             request.write(entry.encode('utf-8'))
--- a/MoinMoin/action/sitemap.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/sitemap.py	Mon Mar 10 00:21:21 2008 +0100
@@ -28,7 +28,7 @@
 
 def sitemap_url(request, base, page):
     """ return a sitemap <url>..</url> fragment for page object <page> """
-    url = page.url(request, relative=False)
+    url = page.url(request)
     pagename = page.page_name
     lastmod = page.mtime_printable(request)
     if lastmod == "0": # can happen in case of errors
--- a/MoinMoin/action/supplementation.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/supplementation.py	Mon Mar 10 00:21:21 2008 +0100
@@ -20,17 +20,17 @@
 
     if pagename.endswith(sub_page_name): # sub_sub_page redirects to sub_page
         query = {}
-        url = Page(request, pagename).url(request, query, relative=False)
+        url = Page(request, pagename).url(request, query)
         request.http_redirect(url)
     elif request.user.may.read(newpagename):
         query = {}
-        url = Page(request, newpagename).url(request, query, relative=False)
+        url = Page(request, newpagename).url(request, query)
         test = Page(request, newpagename)
         if test.exists(): # page is defined -> redirect
             request.http_redirect(url)
         elif request.user.may.write(newpagename):  # page will be created from template
             query = {'action': 'edit', 'backto': newpagename, 'template': quoteWikinameURL(sub_page_template)}
-            url = Page(request, newpagename).url(request, query, relative=False)
+            url = Page(request, newpagename).url(request, query)
             request.http_redirect(url)
         else:
             request.theme.add_msg(errormsg, "error")
--- a/MoinMoin/action/userprefs.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/action/userprefs.py	Mon Mar 10 00:21:21 2008 +0100
@@ -50,8 +50,7 @@
         obj = cls(request)
         if not obj.allowed():
             continue
-        url = request.page.url(request, {'action': 'userprefs', 'sub': sub},
-                               relative=False)
+        url = request.page.url(request, {'action': 'userprefs', 'sub': sub})
         lnk = html.LI().append(html.A(href=url).append(html.Text(obj.title)))
         items.append(lnk)
     return unicode(ret)
--- a/MoinMoin/auth/__init__.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/auth/__init__.py	Mon Mar 10 00:21:21 2008 +0100
@@ -152,7 +152,7 @@
               'stage': auth_name}
     fields.update(extra_fields)
     if request.page:
-        return request.page.url(request, querystr=fields, relative=False)
+        return request.page.url(request, querystr=fields)
     else:
         qstr = wikiutil.makeQueryString(fields)
         return ''.join([request.getBaseURL(), '?', qstr])
--- a/MoinMoin/events/emailnotify.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/events/emailnotify.py	Mon Mar 10 00:21:21 2008 +0100
@@ -130,7 +130,7 @@
         recipients.extend(subscribers[lang])
 
     attachlink = request.getBaseURL() + getAttachUrl(event.pagename, event.filename, request)
-    pagelink = request.getQualifiedURL(page.url(request, {}, relative=False))
+    pagelink = request.getQualifiedURL(page.url(request, {}))
 
     for lang in subscribers:
         emails = []
--- a/MoinMoin/events/jabbernotify.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/events/jabbernotify.py	Mon Mar 10 00:21:21 2008 +0100
@@ -77,7 +77,7 @@
         recipients.extend(subscribers[lang])
 
     attachlink = request.getBaseURL() + getAttachUrl(event.pagename, event.filename, request)
-    pagelink = request.getQualifiedURL(page.url(request, {}, relative=False))
+    pagelink = request.getQualifiedURL(page.url(request, {}))
 
     for lang in subscribers.keys():
         _ = lambda text: request.getText(text, lang=lang)
@@ -170,7 +170,7 @@
             jids = [u.jid for u in subscribers[lang] if u.jid]
             names = [u.name for u in subscribers[lang] if u.jid]
             msg = notification.page_change_message(change_type, request, page, lang, **kwargs)
-            page_url = request.getQualifiedURL(page.url(request, relative=False))
+            page_url = request.getQualifiedURL(page.url(request))
             url = {'url': page_url, 'description': _("Changed page")}
             data = {'action': change_type, 'subject': _('Page changed'),
                             'url_list': [url], 'text': msg['text'], 'diff': msg.get('diff', ''),
--- a/MoinMoin/events/notification.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/events/notification.py	Mon Mar 10 00:21:21 2008 +0100
@@ -53,7 +53,7 @@
 
     """
     query = wikiutil.makeQueryString(querystr, True)
-    return request.getQualifiedURL(page.url(request, query, relative=False))
+    return request.getQualifiedURL(page.url(request, query))
 
 def page_change_message(msgtype, request, page, lang, **kwargs):
     """Prepare a notification text for a page change of given type
--- a/MoinMoin/macro/Action.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/macro/Action.py	Mon Mar 10 00:21:21 2008 +0100
@@ -37,7 +37,7 @@
     if action in _get_valid_actions(macro):
         page = macro.formatter.page
         _kwargs['action'] = action
-        url = page.url(macro.request, querystr=_kwargs, relative=False)
+        url = page.url(macro.request, querystr=_kwargs)
         return ''.join([
             macro.formatter.url(1, url),
             macro.formatter.text(text),
--- a/MoinMoin/macro/Include.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/macro/Include.py	Mon Mar 10 00:21:21 2008 +0100
@@ -187,7 +187,7 @@
                               macro.formatter.text(heading) +
                               macro.formatter.heading(0, level))
             else:
-                url = inc_page.url(request, relative=False)
+                url = inc_page.url(request)
                 result.extend([
                     macro.formatter.heading(1, level, id=heading),
                     macro.formatter.url(1, url, css="include-heading-link"),
--- a/MoinMoin/macro/MonthCalendar.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/macro/MonthCalendar.py	Mon Mar 10 00:21:21 2008 +0100
@@ -273,10 +273,10 @@
     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), relative=False)
-    nextlink = p.url(request, querystr % (qpagenames, parmoffset2 + 1, qtemplate), relative=False)
-    prevylink = p.url(request, querystr % (qpagenames, parmoffset2 - 12, qtemplate), relative=False)
-    nextylink = p.url(request, querystr % (qpagenames, parmoffset2 + 12, qtemplate), relative=False)
+    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))
 
     prevmonth = formatter.url(1, prevlink, 'cal-link', **attrs) + '&lt;' + formatter.url(0)
     nextmonth = formatter.url(1, nextlink, 'cal-link', **attrs) + '&gt;' + formatter.url(0)
@@ -392,7 +392,7 @@
                             r, g, b = (r, g+colorstep, b)
                 r, g, b = cliprgb(r, g, b)
                 style = 'background-color:#%02x%02x%02x' % (r, g, b)
-                fmtlink = formatter.url(1, daypage.url(request, query, relative=False), csslink, **attrs) + str(day) + formatter.url(0)
+                fmtlink = formatter.url(1, daypage.url(request, query), csslink, **attrs) + str(day) + formatter.url(0)
                 if day == currentday and month == currentmonth and year == currentyear:
                     cssday = "cal-today"
                     fmtlink = "<b>%s</b>" % fmtlink # for browser with CSS probs
--- a/MoinMoin/macro/__init__.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/macro/__init__.py	Mon Mar 10 00:21:21 2008 +0100
@@ -275,7 +275,7 @@
 
         page = fmt.page
         allpages_txt = (_('Include system pages'), _('Exclude system pages'))[allpages]
-        allpages_url = page.url(request, querystr={'allpages': allpages and '0' or '1'}, relative=False)
+        allpages_url = page.url(request, querystr={'allpages': allpages and '0' or '1'})
 
         output = [fmt.paragraph(1), _make_index_key(index_letters), fmt.linebreak(0),
                   fmt.url(1, allpages_url), fmt.text(allpages_txt), fmt.url(0), fmt.paragraph(0)] + output
--- a/MoinMoin/parser/text_moin_wiki.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/parser/text_moin_wiki.py	Mon Mar 10 00:21:21 2008 +0100
@@ -761,7 +761,7 @@
                                                              acceptable_attrs=acceptable_attrs_object)
                     if 'action' not in query_args:
                         query_args['action'] = 'content'
-                    url = Page(self.request, page_name_all).url(self.request, querystr=query_args, relative=False)
+                    url = Page(self.request, page_name_all).url(self.request, querystr=query_args)
                     return (self.formatter.transclusion(1, data=url, **tag_attrs) +
                             self._transclude_description(desc, page_name_all) +
                             self.formatter.transclusion(0))
--- a/MoinMoin/parser/text_rst.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/parser/text_rst.py	Mon Mar 10 00:21:21 2008 +0100
@@ -384,7 +384,7 @@
                 if '#' in refuri:
                     pagename, anchor = rsplit(refuri, '#', 1)
                 page = Page(self.request, wikiutil.AbsPageName(self.formatter.page.page_name, pagename))
-                node['refuri'] = page.url(self.request, anchor=anchor, relative=False)
+                node['refuri'] = page.url(self.request, anchor=anchor)
                 if not page.exists():
                     node['classes'].append('nonexistent')
         html4css1.HTMLTranslator.visit_reference(self, node)
--- a/MoinMoin/request/__init__.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/request/__init__.py	Mon Mar 10 00:21:21 2008 +0100
@@ -1148,7 +1148,7 @@
             pname = pagename.replace('_', ' ')
             pg = Page(self, pname)
             if pg.exists():
-                url = pg.url(self, relative=False)
+                url = pg.url(self)
                 self.http_redirect(url)
                 return True
         return False
@@ -1220,10 +1220,10 @@
                         wikitag, wikiurl, wikitail, error = wikiutil.resolve_interwiki(self, wikiname, pagename)
                         url = wikiurl + wikiutil.quoteWikinameURL(wikitail)
                     else:
-                        url = Page(self, pagename).url(self, relative=False)
+                        url = Page(self, pagename).url(self)
                 else:
                     # Or to localized FrontPage
-                    url = wikiutil.getFrontPage(self).url(self, relative=False)
+                    url = wikiutil.getFrontPage(self).url(self)
                 self.http_redirect(url)
                 return self.finish()
 
--- a/MoinMoin/search/results.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/search/results.py	Mon Mar 10 00:21:21 2008 +0100
@@ -671,8 +671,7 @@
         querydict = wikiutil.parseQueryString(self.request.query_string)
         def page_url(n):
             querydict.update({'from': n * hitsPerPage})
-            return self.request.page.url(self.request, querydict,
-                    escape=0, relative=False)
+            return self.request.page.url(self.request, querydict, escape=0)
 
         pages = hitsNum // hitsPerPage
         remainder = hitsNum % hitsPerPage
--- a/MoinMoin/theme/__init__.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/theme/__init__.py	Mon Mar 10 00:21:21 2008 +0100
@@ -829,7 +829,7 @@
         """
         request = self.request
         url = page.url(request, querystr={
-                'action': 'rss_rc', 'ddiffs': '1', 'unique': '1', }, escape=0, relative=False)
+                'action': 'rss_rc', 'ddiffs': '1', 'unique': '1', }, escape=0)
         return url
 
     def rsslink(self, d):
@@ -1202,7 +1202,7 @@
 var gui_editor_link_text = "%(text)s";
 //-->
 </script>
-""" % {'url': page.url(self.request, querystr={'action': 'edit', 'editor': 'gui', }, relative=False),
+""" % {'url': page.url(self.request, querystr={'action': 'edit', 'editor': 'gui', }),
        'text': _('Edit (GUI)'),
       }
 
@@ -1633,7 +1633,7 @@
             request.user.edit_on_doubleclick):
             if request.user.may.write(pagename): # separating this gains speed
                 querystr = wikiutil.escape(wikiutil.makeQueryString({'action': 'edit'}))
-                url = page.url(request, querystr, relative=False)
+                url = page.url(request, querystr)
                 bodyattr.append(''' ondblclick="location.href='%s'" ''' % url)
 
         # Set body to the user interface language and direction
--- a/MoinMoin/userprefs/__init__.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/userprefs/__init__.py	Mon Mar 10 00:21:21 2008 +0100
@@ -72,7 +72,7 @@
             preferences forms and then call make_row(). See
             existing plugins, e.g. changepass.py.
         '''
-        action = self.request.page.url(self.request, relative=False)
+        action = self.request.page.url(self.request)
         _form = html.FORM(action=action)
         _form.append(html.INPUT(type="hidden", name="action", value="userprefs"))
         _form.append(html.INPUT(type="hidden", name="handler", value=self.name))
--- a/MoinMoin/userprefs/oid.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/userprefs/oid.py	Mon Mar 10 00:21:21 2008 +0100
@@ -81,8 +81,7 @@
             qstr = wikiutil.makeQueryString({'action': 'userprefs',
                                              'handler': 'oid',
                                              'oid.return': '1'})
-            return_to = '%s/%s' % (request.getBaseURL(),
-                                   request.page.url(request, qstr))
+            return_to = request.getQualifiedURL(request.page.url(request, qstr))
             trust_root = request.getBaseURL()
             if oidreq.shouldSendRedirect():
                 redirect_url = oidreq.redirectURL(trust_root, return_to)
@@ -105,8 +104,7 @@
         qstr = wikiutil.makeQueryString({'action': 'userprefs',
                                          'handler': 'oid',
                                          'oid.return': '1'})
-        return_to = '%s/%s' % (request.getBaseURL(),
-                               request.page.url(request, qstr))
+        return_to = request.getQualifiedURL(request.page.url(request, qstr))
         info = oidconsumer.complete(query, return_to=return_to)
         if info.status == consumer.FAILURE:
             return _('OpenID error: %s.') % info.message
--- a/MoinMoin/xmlrpc/__init__.py	Sun Mar 09 23:10:28 2008 +0100
+++ b/MoinMoin/xmlrpc/__init__.py	Mon Mar 10 00:21:21 2008 +0100
@@ -614,7 +614,7 @@
 
         return [(self._outstr(hit.page_name),
                  self._outstr(results.formatContext(hit, length, 1)),
-                 self.request.getQualifiedURL(hit.page.url(self.request, {}, relative=False)))
+                 self.request.getQualifiedURL(hit.page.url(self.request, {})))
                 for hit in results.hits]
 
     def xmlrpc_getMoinVersion(self):
--- a/docs/CHANGES	Sun Mar 09 23:10:28 2008 +0100
+++ b/docs/CHANGES	Mon Mar 10 00:21:21 2008 +0100
@@ -65,6 +65,8 @@
       _('This will be parsed/formatted by MoinMoin!', wiki=True)
       _('This will be used as a left side of percent operator. %s',
         wiki=True, percent=True)
+    * Page.url 'relative' keyword param (default: True in 1.6 and early 1.7)
+      was changed to default False).
 
   New Features:
     * new powerful and flexible logging, please see wiki/config/logging/.