--- func.php.orig 2004-03-30 10:50:56.000000000 +0900
+++ func.php 2004-05-31 01:10:54.000000000 +0900
@@ -669,6 +669,19 @@
return join($glue, $arr);
}
+//
+function get_word_in_vars()
+{
+ global $vars;
+
+ $encoding = array_key_exists('encoding',$vars) ? $vars['encoding'] : SOURCE_ENCODING;
+ $word = array_key_exists('word',$vars) ? $vars['word'] : '';
+ if ($encoding != SOURCE_ENCODING) {
+ $word = mb_convert_encoding($word, SOURCE_ENCODING, $encoding);
+ }
+ return $word;
+}
+
//is_a
//(PHP 4 >= 4.2.0)
//
--- html.php.orig 2004-03-30 10:50:56.000000000 +0900
+++ html.php 2004-05-31 01:18:07.000000000 +0900
@@ -71,8 +71,8 @@
//Γ±ΈμΈ‘Ίχ
if ($search_word_color and array_key_exists('word',$vars))
{
- $body = '
'.$_msg_word.htmlspecialchars($vars['word'])."
$hr\n$body";
- $words = array_flip(array_splice(preg_split('/\s+/',$vars['word'],-1,PREG_SPLIT_NO_EMPTY),0,10));
+ $body = ''.$_msg_word.htmlspecialchars(get_word_in_vars())."
$hr\n$body";
+ $words = array_flip(array_splice(preg_split('/\s+/',get_word_in_vars(),-1,PREG_SPLIT_NO_EMPTY),0,10));
$keys = array();
foreach ($words as $word=>$id)
{
--- plugin/search.inc.php.orig 2003-06-13 20:43:53.000000000 +0900
+++ plugin/search.inc.php 2004-05-31 01:17:28.000000000 +0900
@@ -10,13 +10,13 @@
global $script,$vars;
global $_title_result,$_title_search,$_msg_searching,$_btn_and,$_btn_or,$_btn_search;
- $s_word = array_key_exists('word',$vars) ? htmlspecialchars($vars['word']) : '';
+ $s_word = htmlspecialchars(get_word_in_vars());
$type = array_key_exists('type',$vars) ? $vars['type'] : '';
if ($s_word != '')
{
$msg = str_replace('$1',$s_word,$_title_result);
- $body = do_search($vars['word'],$type);
+ $body = do_search($s_word,$type);
}
else
{