/search: escape query text in next/prev link

diff --git a/src/newslash_web/templates/search/search.html.tt2 b/src/newslash_web/templates/search/search.html.tt2
index 111dcca..f19223b 100644 (file)
--- a/src/newslash_web/templates/search/search.html.tt2
+++ b/src/newslash_web/templates/search/search.html.tt2
@@ -75,25 +75,29 @@
 
       [%- IF results.total_hits > (start + item_per_page); next_page = 1; ELSE; next_page = 0; END%]
       [%- IF start > 0; prev_page = 1; ELSE; prev_page = 0; END %]
+
       [%- IF next_page || prev_page %]
-      [% IF target; target_token = "&target=" _ target; ELSE; target_token = ""; END %]
-      [% IF sort_reverse; sort_token = "&sort_reverse=" _ sort_reverse; ELSE; sort_token = ""; END %]
       <div class="pager">
+        [% IF target; target = target | uri; target_token = "&target=" _ target; ELSE; target_token = ""; END %]
+        [% IF sort_reverse; sort_reverse = sort_reverse | uri; sort_token = "&sort_reverse=" _ sort_reverse; ELSE; sort_token = ""; END %]
+
         [%- IF prev_page -%]
         <span class="prev">
           [%- IF start == item_per_page %]
-          <a href="/search?q=[% query_words %][% target_token %][% sort_token %]">前</a>
+          <a href="/search?q=[% query_words | uri %][% target_token %][% sort_token %]">前</a>
           [%- ELSE %]
-          <a href="/search?q=[% query_words %][% target_token %][% sort_token %]">最初</a>
-          <a href="/search?q=[% query_words %][% target_token %][% sort_token %]&start=[% start - item_per_page %]">前</a>
+          <a href="/search?q=[% query_words | uri %][% target_token %][% sort_token %]">最初</a>
+          <a href="/search?q=[% query_words | uri %][% target_token %][% sort_token %]&start=[% start - item_per_page %]">前</a>
           [%- END %]
         </span>
         [%- END -%]
+
         [%- IF next_page -%]
         <span class="next">
-          <a href="/search?q=[% query_words %][% target_token %][% sort_token %]&start=[% start + item_per_page %]">次</a>
+          <a href="/search?q=[% query_words | uri %][% target_token %][% sort_token %]&start=[% start + item_per_page %]">次</a>
         </span>
         [%- END -%]
+
       </div>
       [%- END %]