Commit: 7c4201befb0a5e78793159a7994183ea3912d917 - pukiwiki-fork (git)

Commit MetaInfo

• Revision: 7c4201befb0a5e78793159a7994183ea3912d917 (tree)
• Zeit: 2017-09-30 10:44:00
• Autor: umorigu <umorigu@gmai...>
• Commiter: umorigu

Log Message

Fix encode_hint logic

Ändern Zusammenfassung

• modified: plugin/search2.inc.php
• modified: skin/search2.js

Diff

--- a/plugin/search2.inc.php
+++ b/plugin/search2.inc.php
@@ -166,7 +166,7 @@ function plugin_search2_do_search($query_text, $base, $start_index)
 			mb_convert_variables('UTF-8', SOURCE_ENCODING, $obj);
 		}
 	}
-	print(json_encode(obj, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+	print(json_encode($obj, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
 }
 
 function plugin_search2_search_form($s_word = '', $type = '', $bases = array())

--- a/skin/search2.js
+++ b/skin/search2.js
@@ -28,7 +28,7 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
     function doSearch(searchText, session, startIndex) {
       var url = './?cmd=search2&action=query';
       var props = getSiteProps();
-      url += '&encode_hint=\u3077';
+      url += '&encode_hint=' + encodeURIComponent('\u3077');
       if (searchText) {
         url += '&q=' + encodeURIComponent(searchText);
       }
@@ -451,7 +451,8 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
               baseUri = props.base_uri_pathname;
             }
             var url = baseUri + '?' +
-              (props.is_utf8 ? '' : 'encode_hint=\u3077' + '&') +
+              (props.is_utf8 ? '' : 'encode_hint=' +
+                encodeURIComponent('\u3077') + '&') +
               'cmd=search2' +
               '&q=' + encodeSearchText(q) +
               (base ? '&base=' + encodeURIComponent(base) : '');