1.1 --- a/EventAggregatorSupport.py Wed Aug 04 00:06:36 2010 +0200
1.2 +++ b/EventAggregatorSupport.py Sun Aug 08 17:07:59 2010 +0200
1.3 @@ -75,9 +75,6 @@
1.4
1.5 # Utility functions.
1.6
1.7 -def isMoin15():
1.8 - return version.release.startswith("1.5.")
1.9 -
1.10 def getCategoryPattern(request):
1.11 global category_regexp
1.12
1.13 @@ -342,11 +339,7 @@
1.14 """
1.15
1.16 query = search.QueryParser().parse_query('category:%s' % pagename)
1.17 - if isMoin15():
1.18 - results = search.searchPages(request, query)
1.19 - results.sortByPagename()
1.20 - else:
1.21 - results = search.searchPages(request, query, "page_name")
1.22 + results = search.searchPages(request, query, "page_name")
1.23
1.24 cat_pattern = getCategoryPattern(request)
1.25 pages = []
1.26 @@ -377,21 +370,13 @@
1.27
1.28 "Using 'request', return the URL of this page."
1.29
1.30 - page = self.page
1.31 -
1.32 - if isMoin15():
1.33 - return request.getQualifiedURL(page.url(request))
1.34 - else:
1.35 - return request.getQualifiedURL(page.url(request, relative=0))
1.36 + return request.getQualifiedURL(self.page.url(request, relative=0))
1.37
1.38 def getFormat(self):
1.39
1.40 "Get the format used on this page."
1.41
1.42 - if isMoin15():
1.43 - return "wiki" # page.pi_format
1.44 - else:
1.45 - return self.page.pi["format"]
1.46 + return self.page.pi["format"]
1.47
1.48 def getRevisions(self):
1.49
1.50 @@ -1479,11 +1464,7 @@
1.51
1.52 "Return a nicely formatted title/name for the given 'page'."
1.53
1.54 - if isMoin15():
1.55 - title = page.split_title(page.request, force=1)
1.56 - else:
1.57 - title = page.split_title(force=1)
1.58 -
1.59 + title = page.split_title(force=1)
1.60 return getPrettyTitle(title)
1.61
1.62 def linkToPage(request, page, text, query_string=None):
1.63 @@ -1494,14 +1475,7 @@
1.64 """
1.65
1.66 text = wikiutil.escape(text)
1.67 -
1.68 - if isMoin15():
1.69 - url = wikiutil.quoteWikinameURL(page.page_name)
1.70 - if query_string is not None:
1.71 - url = "%s?%s" % (url, query_string)
1.72 - return wikiutil.link_tag(request, url, text, getattr(page, "formatter", None))
1.73 - else:
1.74 - return page.link_to_raw(request, text, query_string)
1.75 + return page.link_to_raw(request, text, query_string)
1.76
1.77 def getFullPageName(parent, title):
1.78