diff -Naru -x '*~' /home/httpd/html/moodle.orig/mod/wiki/ewiki/ewiki.php /home/httpd/html/moodle/mod/wiki/ewiki/ewiki.php
--- /home/httpd/html/moodle.orig/mod/wiki/ewiki/ewiki.php	2005-05-24 15:07:45.000000000 +0900
+++ /home/httpd/html/moodle/mod/wiki/ewiki/ewiki.php	2005-09-25 00:13:55.000000000 +0900
@@ -75,7 +75,8 @@
 	define("EWIKI_UP_UPLOAD", "upload");
         #- other stuff
         define("EWIKI_DEFAULT_LANG", "en");
-        define("EWIKI_CHARSET", "ISO-8859-1");
+//        define("EWIKI_CHARSET", "ISO-8859-1");
+	define("EWIKI_CHARSET", get_string('thischarset','moodle')); 
 	#- user permissions
 	define("EWIKI_PROTECTED_MODE", 0);	# disable funcs + require auth
 	define("EWIKI_PROTECTED_MODE_HIDING", 0);  # hides disallowed actions
diff -Naru -x '*~' /home/httpd/html/moodle.orig/mod/wiki/lib.php /home/httpd/html/moodle/mod/wiki/lib.php
--- /home/httpd/html/moodle.orig/mod/wiki/lib.php	2005-07-06 11:19:10.000000000 +0900
+++ /home/httpd/html/moodle/mod/wiki/lib.php	2005-10-14 08:09:25.000000000 +0900
@@ -1050,7 +1050,7 @@
   $ewscript = 'admin.php?id='.$cmid;
   if (isset($userid) && $userid!=0) $ewscript .= '&userid='.$userid;
   if (isset($groupid) && $groupid!=0) $ewscript .= '&groupid='.$groupid;
-  if (isset($page)) $ewscript .= '&page='.$page;
+  if (isset($page)) $ewscript .= '&page='.urlencode($page);
   $ewscript.="&action=";
 
 
@@ -1106,7 +1106,7 @@
     $cell_pagename="";
     $cell_flags="";
     if ($data["flags"] & EWIKI_DB_F_TEXT) {
-        $cell_pagename .= '<A HREF="' . EWIKI_SCRIPT . $id . '">';
+        $cell_pagename .= '<A HREF="' . EWIKI_SCRIPT . urlencode($id) . '">';
     } else {
         $cell_pagename .= '<A HREF="' . EWIKI_SCRIPT_BINARY . $id . '">';
     }
diff -Naru -x '*~' /home/httpd/html/moodle.orig/mod/wiki/view.php /home/httpd/html/moodle/mod/wiki/view.php
--- /home/httpd/html/moodle.orig/mod/wiki/view.php	2005-05-24 15:07:45.000000000 +0900
+++ /home/httpd/html/moodle/mod/wiki/view.php	2005-10-13 23:39:43.000000000 +0900
@@ -333,7 +333,9 @@
         $currenttab = '';
         foreach ($tabs as $tab) {
             $tabname = get_string("tab$tab", 'wiki');
-            $row[] = new tabobject($tabname, $ewbase.'&amp;page='.$tab.'/'.$ewiki_id, $tabname);
+//          $row[] = new tabobject($tabname, $ewbase.'&amp;page='.$tab.'/'.$ewiki_id, $tabname);
+            // t-kita 20051013
+            $row[] = new tabobject($tabname, $ewbase.'&amp;page='.$tab.'/'.urlencode($ewiki_id), $tabname);
             if ($ewiki_action == "$tab" or in_array($page, $specialpages)) {
                 $currenttab = $tabname;
             }