BugTrack/637 mb_convert_variables() for $vars

diff --git a/init.php b/init.php
index 4f76800..ee48287 100644 (file)
--- a/init.php
+++ b/init.php
@@ -2,7 +2,7 @@
 /////////////////////////////////////////////////
 // PukiWiki - Yet another WikiWikiWeb clone.
 //
-// $Id: init.php,v 1.90 2004/07/18 09:25:13 henoheno Exp $
+// $Id: init.php,v 1.91 2004/07/23 14:27:17 henoheno Exp $
 //
 
 /////////////////////////////////////////////////
@@ -189,16 +189,18 @@ if (isset($post['encode_hint']) && $post['encode_hint'] != '')
        // ¥³¡¼¥É¤¬º®Æþ¤·¤¿¾ì¹ç¤Ë¡¢¥³¡¼¥É¸¡½Ð¤Ë¼ºÇÔ¤¹¤ë¶²¤ì¤¬¤¢¤ë¡£
        $encode = mb_detect_encoding($post['encode_hint']);
        mb_convert_variables(SOURCE_ENCODING, $encode, $post);
+       mb_convert_variables(SOURCE_ENCODING, $encode, $vars);
 }
 else if (isset($post['charset']) && $post['charset'] != '')
 {
        // TrackBack Ping¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤³¤È¤¬¤¢¤ë
        // »ØÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢¤½¤ÎÆâÍƤÇÊÑ´¹¤ò»î¤ß¤ë
+       // ¤¦¤Þ¤¯¤¤¤«¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¥³¡¼¥É¸¡½Ð¤ÎÀßÄê¤ÇÊÑ´¹¤·¤Ê¤ª¤·
        if (mb_convert_variables(SOURCE_ENCODING, $post['charset'], $post) !== $post['charset'])
-       {
-               // ¤¦¤Þ¤¯¤¤¤«¤Ê¤«¤Ã¤¿¾ì¹ç¤Ï¥³¡¼¥É¸¡½Ð¤ÎÀßÄê¤ÇÊÑ´¹¤·¤Ê¤ª¤·
                mb_convert_variables(SOURCE_ENCODING, 'auto', $post);
-       }
+
+       if (mb_convert_variables(SOURCE_ENCODING, $vars['charset'], $post) !== $vars['charset'])
+               mb_convert_variables(SOURCE_ENCODING, 'auto', $vars);
 }
 else if (count($post) > 0)
 {
@@ -207,6 +209,7 @@ else if (count($post) > 0)
 
        // Á´Éô¤Þ¤È¤á¤Æ¡¢¥³¡¼¥É¸¡½Ð¡¢ÊÑ´¹
        mb_convert_variables(SOURCE_ENCODING, 'auto', $post);
+       mb_convert_variables(SOURCE_ENCODING, 'auto', $vars);
 }
 
 // get ¤Ï <form> ¤«¤é¤Î¾ì¹ç¤È¡¢<a href="http;//script/?query> ¤Î¾ì¹ç¤¬¤¢¤ë