changeset 1471:415e5c22adda

recall action not necessary, rev can also be passed to show
author Franz Pletz <fpletz AT franz-pletz DOT org>
date Wed, 23 Aug 2006 21:04:07 +0200
parents 9d82a1c73131
children ff126e63a52e
files MoinMoin/search/results.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/search/results.py	Wed Aug 23 20:42:35 2006 +0200
+++ b/MoinMoin/search/results.py	Wed Aug 23 21:04:07 2006 +0200
@@ -348,7 +348,6 @@
                     }
                 elif page.page.rev and page.page.rev != page.page.getRevList()[0]:
                     querydict = {
-                        'action': 'recall',
                         'rev': page.page.rev,
                     }
                 else:
@@ -432,7 +431,6 @@
                     fmt_context = self.formatContext(page, context, maxlines)
                     if page.page.rev and page.page.rev != page.page.getRevList()[0]:
                         querydict = {
-                            'action': 'recall',
                             'rev': page.page.rev,
                         }
                     else:
@@ -757,7 +755,9 @@
     def querystring(self, querydict=None):
         """ Return query string, used in the page link """
         if querydict is None:
-            querydict = {'highlight': self.query.highlight_re()}
+            querydict = {}
+        if 'action' not in querydict or querydict['action'] == 'AttachFile':
+            querydict.update({'highlight': self.query.highlight_re()})
         querystr = wikiutil.makeQueryString(querydict)
         #querystr = wikiutil.escape(querystr)
         return querystr