diff MoinMoin/theme/__init__.py @ 3040:8608b258f8e6

bug fix of MoinMoinBugs/MoveAttachmentNotWorkingWithModPython (thanks to Boleslaw Kulbabinski) (ported from 1.6)
author Reimar Bauer <rb.proj AT googlemail DOT com>
date Tue, 05 Feb 2008 21:22:56 +0100
parents 07ab9d4b8bb8
children 1e9444f35a22
line wrap: on
line diff
--- a/MoinMoin/theme/__init__.py	Mon Feb 04 10:17:58 2008 +0100
+++ b/MoinMoin/theme/__init__.py	Tue Feb 05 21:22:56 2008 +0100
@@ -736,11 +736,13 @@
             'search_value': wikiutil.escape(form.get('value', [''])[0], 1),
             'search_full_label': _('Text', formatted=False),
             'search_title_label': _('Titles', formatted=False),
+            'baseurl': self.request.getScriptname(),
+            'pagename_quoted': wikiutil.quoteWikinameURL(self.request.page.page_name),
             }
         d.update(updates)
 
         html = u'''
-<form id="searchform" method="get" action="">
+<form id="searchform" method="get" action="%(baseurl)s/%(pagename_quoted)s">
 <div>
 <input type="hidden" name="action" value="fullsearch">
 <input type="hidden" name="context" value="180">
@@ -999,7 +1001,9 @@
             'label': titles['__title__'],
             'options': '\n'.join(options),
             'rev_field': rev and '<input type="hidden" name="rev" value="%d">' % rev or '',
-            'do_button': _("Do")
+            'do_button': _("Do", formatted=False),
+            'baseurl': self.request.getScriptname(),
+            'pagename_quoted': wikiutil.quoteWikinameURL(self.request.page.page_name)
             }
         html = '''
 <form class="actionsmenu" method="get" action="">