← Back to branch summary

~ubuntu-branches/ubuntu/natty/moin/natty-updates

« back to all changes in this revision

Viewing changes to MoinMoin/macro/FullSearch.py

  • Committer: Bazaar Package Importer
  • Author(s): Jonas Smedegaard
  • Date: 2008-06-22 21:17:13 UTC
  • mto: This revision was merged to the branch mainline in revision 18.
  • Revision ID: james.westby@ubuntu.com-20080622211713-inlv5k4eifxckelr
Import upstream version 1.7.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
MoinMoin/macro/FullSearch.py
42
42
    @return: search box html fragment
43
43
    """
44
44
    _ = macro._
45
 
    if 'value' in macro.request.values:
46
 
        default = wikiutil.escape(macro.request.values["value"], quote=1)
 
45
    if 'value' in macro.form:
 
46
        default = wikiutil.escape(macro.form["value"][0], quote=1)
47
47
    else:
48
48
        default = ''
49
49
 
67
67
    # Format
68
68
    type = (type == "titlesearch")
69
69
    html = [
70
 
        u'<form method="get" action="%s">' % macro.request.href(macro.request.formatter.page.page_name),
 
70
        u'<form method="get" action="%s/%s">' % (macro.request.getScriptname(), wikiutil.quoteWikinameURL(macro.request.formatter.page.page_name)),
71
71
        u'<div>',
72
72
        u'<input type="hidden" name="action" value="fullsearch">',
73
73
        u'<input type="hidden" name="titlesearch" value="%i">' % type,