kallithea Changeset - 14852cad8ee7

Changeset - 14852cad8ee7

Parent rev.

Child rev.

[Not reviewed]

beta

0 1 0

Marcin Kuzminski - 13 years ago 2012-09-15 22:05:49
marcin@python-works.com

fixes issues #566 non-ascii search params are crashing paginator
- those arguments needs to be converted to strings

1 file changed with 2 insertions and 1 deletions:

rhodecode/controllers/search.py

0 comments (0 inline, 0 general)

rhodecode/controllers/search.py

➞

Show inline comments

@@ @@ -37,12 +37,13 @@ from webhelpers.paginate import Page @@
 from webhelpers.util import update_params
 from whoosh.index import open_dir, EmptyIndexError
 from whoosh.qparser import QueryParser, QueryParserError
 from whoosh.query import Phrase, Wildcard, Term, Prefix
 from rhodecode.model.repo import RepoModel
 from rhodecode.lib.utils2 import safe_str
 log = logging.getLogger(__name__)
 class SearchController(BaseController):
@@ @@ -113,13 +114,13 @@ class SearchController(BaseController): @@
                     c.runtime = '%s results (%.3f seconds)' % (
                         res_ln, results.runtime
+                    )
                     def url_generator(**kw):
                         return update_params("?q=%s&type=%s" \
-                                           % (c.cur_query, c.cur_type), **kw)
+                        % (safe_str(c.cur_query), safe_str(c.cur_type)), **kw)
                     repo_location = RepoModel().repos_path
                     c.formated_results = Page(
                         WhooshResultWrapper(search_type, searcher, matcher,
                                             highlight_items, repo_location),
                         page=p,
                         item_count=res_ln,

0 comments (0 inline, 0 general)