From: umorigu <umorigu@gmail.com>
Date: Fri, 29 Sep 2017 15:27:35 +0000 (+0900)
Subject: Improve EUC-JP handling
X-Git-Url: http://git.osdn.net/view?p=pukiwiki%2Fpukiwiki.git;a=commitdiff_plain;h=a31c50000135a4d7994990cc8827dc0ba3cce06d

Improve EUC-JP handling
---

diff --git a/plugin/search2.inc.php b/plugin/search2.inc.php
index 30348df..a47e05a 100644
--- a/plugin/search2.inc.php
+++ b/plugin/search2.inc.php
@@ -44,6 +44,7 @@ function plugin_search2_action()
 		}
 	} else if ($action === 'query') {
 		$text = isset($vars['q']) ? $vars['q'] : '';
+		header('Content-Type: application/json; charset=UTF-8');
 		plugin_search2_do_search($text, $base, $start_index);
 		exit;
 	}
@@ -157,7 +158,15 @@ function plugin_search2_do_search($query_text, $base, $start_index)
 		'next_start_index' => $readable_page_index + 1,
 		'search_done' => $search_done,
 		'results' => $found_pages);
-	print(json_encode($result_obj, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
+	$obj = $result_obj;
+	if (!defined('PKWK_UTF8_ENABLE')) {
+		if (SOURCE_ENCODING === 'EUC-JP') {
+			mb_convert_variables('UTF-8', 'CP51932', $obj);
+		} else {
+			mb_convert_variables('UTF-8', SOURCE_ENCODING, $obj);
+		}
+	}
+	print(json_encode(obj, JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES));
 }
 
 function plugin_search2_search_form($s_word = '', $type = '', $bases = array())
diff --git a/skin/search2.js b/skin/search2.js
index b56dd1e..a3898fb 100644
--- a/skin/search2.js
+++ b/skin/search2.js
@@ -21,12 +21,14 @@ window.addEventListener && window.addEventListener('DOMContentLoaded', function(
           '&': '&amp;',
           '"': '&quot;',
           '<': '&lt;',
-          '>': '&gt;',
+          '>': '&gt;'
         }[m];
       });
     }
     function doSearch(searchText, session, startIndex) {
       var url = './?cmd=search2&action=query';
+      var props = getSiteProps();
+      url += '&encode_hint=\u3077';
       if (searchText) {
         url += '&q=' + encodeURIComponent(searchText);
       }