changeset 1559:f0f228749435

Merge with main.
author Alexander Schremmer <alex AT alexanderweb DOT de>
date Mon, 18 Sep 2006 12:00:37 +0200
parents 5628126794b4 (current diff) 60067807cf9a (diff)
children 9a5e2c7531a0
files
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageEditor.py	Mon Sep 18 11:59:01 2006 +0200
+++ b/MoinMoin/PageEditor.py	Mon Sep 18 12:00:37 2006 +0200
@@ -584,7 +584,7 @@
         """
         _ = lambda s, formatted=True, r=self.request, l=email_lang: r.getText(s, formatted=formatted, lang=l)
 
-        pagelink = self.request.getQualifiedURL(self.url(self.request))
+        pagelink = self.request.getQualifiedURL(self.url(self.request, relative=False))
         if len(revisions) >= 2:
             pagelink += "?action=diff&rev2=%i&rev1=%i" % tuple(revisions[-2:])
 
--- a/MoinMoin/config/multiconfig.py	Mon Sep 18 11:59:01 2006 +0200
+++ b/MoinMoin/config/multiconfig.py	Mon Sep 18 12:00:37 2006 +0200
@@ -551,7 +551,7 @@
         self.cache.page_dict_regex = re.compile(self.page_dict_regex, re.UNICODE)
         self.cache.page_group_regex = re.compile(self.page_group_regex, re.UNICODE)
         self.cache.page_template_regex = re.compile(self.page_template_regex, re.UNICODE)
-        self.cache.ua_spiders = re.compile(self.ua_spiders, re.I)
+        self.cache.ua_spiders = self.ua_spiders and re.compile(self.ua_spiders, re.I)
 
         self._check_directories()
 
--- a/MoinMoin/request/__init__.py	Mon Sep 18 11:59:01 2006 +0200
+++ b/MoinMoin/request/__init__.py	Mon Sep 18 12:00:37 2006 +0200
@@ -884,7 +884,7 @@
         """ check if the user agent for current request is a spider/bot """
         isSpider = False
         ua = self.getUserAgent()
-        if ua:
+        if ua and self.cfg.cache.ua_spiders:
             isSpider = self.cfg.cache.ua_spiders.search(ua) is not None
         return isSpider