diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-4/ChangeLog zen-cart-v1.2.0-l10n-jp-5/ChangeLog
--- zen-cart-v1.2.0-l10n-jp-4/ChangeLog	2006-01-09 16:20:21.000000000 +0900
+++ zen-cart-v1.2.0-l10n-jp-5/ChangeLog	2006-01-23 19:17:52.000000000 +0900
@@ -1,3 +1,66 @@
+2006-01-23 17:57  shida
+
+        * INSTALL.TXT: v1.2.0-l10n-jp-5のリリース
+
+2006-01-22 14:58  shida
+
+        * admin/includes/functions/: general.php:
+          検索後に削除しても消えない
+          http://www.zen-cart.jp/pukiwiki/534.html
+
+          の件のバグフィクス。
+
+          get_all_get_paramsで検索ワードをURLエンコードしていないため、
+          2画面目などに正しくキーワードがわたらず、検索条件が消えてしまう。
+
+          望月さんありがとうございました。 m(_ _)m
+
+2006-01-22 11:56  shida
+
+        * includes/classes/db/mysql/query_factory.php:
+          よくみると、本家、1.2.5や1.2.6では、   if (!$zf_pconnect == 'false') {
+             $this->link = @mysql_connect($zf_host, $zf_user,
+          $zf_password, true);   } else {      $this->link =
+          @mysql_connect($zf_host, $zf_user, $zf_password, true);   }
+          と常にpconnectを使わないようになっている。
+          これまでどおり、上がconnectでしたがpconnectなら、
+          hiraさんの条件文
+
+            if ($zf_pconnect == 'false') {
+
+          の方が正しい。
+
+          再修正。
+
+2006-01-22 11:45  shida
+
+        * includes/classes/db/mysql/query_factory.php: 常にpconnect
+          http://www.zen-cart.jp/pukiwiki/491.html
+
+          のバグフィクス。 zen-cart-v1.2.5d(英語版)をみると既に対応済み。
+
+          かずさん、hiraさん、ありがとうございます。m(_ _)m
+
+2006-01-22 11:38  shida
+
+        * includes/modules/pages/: address_book_process/header_php.php,
+          checkout_payment_address/header_php.php,
+          checkout_shipping_address/header_php.php,
+          create_account/header_php.php:
+          住所で高知県と入力しても香川県になってしまう
+          http://www.zen-cart.jp/pukiwiki/461.html
+
+          のバグフィックス。
+
+          mysqlのサーバーの文字コードがlatin1等になっている環境で発生。
+
+          zone_name, zone_codeに対して、BINARYで検索することで対応。
+
+          参考) http://myna2.mysql.gr.jp/mysqlml/mysql/msg/6707
+
+          朱理さん、佐々木2号さんありがとうございます。
+
+
 2006-01-09 15:56  shida
 
         * ChangeLog, INSTALL.TXT:
diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-4/INSTALL.TXT zen-cart-v1.2.0-l10n-jp-5/INSTALL.TXT
--- zen-cart-v1.2.0-l10n-jp-4/INSTALL.TXT	2006-01-09 15:57:54.000000000 +0900
+++ zen-cart-v1.2.0-l10n-jp-5/INSTALL.TXT	2006-01-23 17:57:57.000000000 +0900
@@ -1,6 +1,6 @@
 Zen Cart - The Art of E-Commerce
 
-Version 1.2.0-l10n-jp-4
+Version 1.2.0-l10n-jp-5
 
 
 Zen Cartの導入は自動インストールシステムによって行います。
diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-4/admin/includes/functions/general.php zen-cart-v1.2.0-l10n-jp-5/admin/includes/functions/general.php
--- zen-cart-v1.2.0-l10n-jp-4/admin/includes/functions/general.php	2005-06-02 13:24:44.000000000 +0900
+++ zen-cart-v1.2.0-l10n-jp-5/admin/includes/functions/general.php	2006-01-22 14:59:47.000000000 +0900
@@ -136,7 +136,7 @@
 
     reset($_GET);
     while (list($key, $value) = each($_GET)) {
-      if (($key != zen_session_name()) && ($key != 'error') && (!in_array($key, $exclude_array))) $get_url .= $key . '=' . $value . '&';
+      if (($key != zen_session_name()) && ($key != 'error') && (!in_array($key, $exclude_array))) $get_url .= $key . '=' . rawurlencode(stripslashes($value)) . '&';
     }
 
     return $get_url;
diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-4/includes/classes/db/mysql/query_factory.php zen-cart-v1.2.0-l10n-jp-5/includes/classes/db/mysql/query_factory.php
--- zen-cart-v1.2.0-l10n-jp-4/includes/classes/db/mysql/query_factory.php	2004-09-01 13:47:51.000000000 +0900
+++ zen-cart-v1.2.0-l10n-jp-5/includes/classes/db/mysql/query_factory.php	2006-01-22 11:56:23.000000000 +0900
@@ -31,7 +31,7 @@
   function connect($zf_host, $zf_user, $zf_password, $zf_database, $zf_pconnect=false, $zp_real=false) {
 //@TODO error class required to virtualise & centralise all error reporting/logging/debugging 
     $this->database = $zf_database;
-    if (!$zf_pconnect) {
+    if ($zf_pconnect == 'false') {
       $this->link = @mysql_connect($zf_host, $zf_user, $zf_password);
     } else {
       $this->link = @mysql_pconnect($zf_host, $zf_user, $zf_password);
diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-4/includes/modules/pages/address_book_process/header_php.php zen-cart-v1.2.0-l10n-jp-5/includes/modules/pages/address_book_process/header_php.php
--- zen-cart-v1.2.0-l10n-jp-4/includes/modules/pages/address_book_process/header_php.php	2004-12-04 13:24:20.000000000 +0900
+++ zen-cart-v1.2.0-l10n-jp-5/includes/modules/pages/address_book_process/header_php.php	2006-01-22 11:39:48.000000000 +0900
@@ -126,8 +126,8 @@
         $zone_query = "select distinct zone_id
                        from   " . TABLE_ZONES . "
                        where  zone_country_id = '" . (int)$country . "'
-                       and    (zone_name like '" . zen_db_input($state) . "%'
-                       or     zone_code like '%" . zen_db_input($state) . "%')";
+                       and    (BINARY zone_name like '" . zen_db_input($state) . "%'
+                       or     BINARY zone_code like '%" . zen_db_input($state) . "%')";
 
         $zone = $db->Execute($zone_query);
 
diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-4/includes/modules/pages/checkout_payment_address/header_php.php zen-cart-v1.2.0-l10n-jp-5/includes/modules/pages/checkout_payment_address/header_php.php
--- zen-cart-v1.2.0-l10n-jp-4/includes/modules/pages/checkout_payment_address/header_php.php	2004-12-04 13:24:20.000000000 +0900
+++ zen-cart-v1.2.0-l10n-jp-5/includes/modules/pages/checkout_payment_address/header_php.php	2006-01-22 11:39:49.000000000 +0900
@@ -115,8 +115,8 @@
         if ($entry_state_has_zones == true) {
           $zone_query = "select distinct zone_id from " . TABLE_ZONES . "
                          where zone_country_id = '" . (int)$country . "'
-                         and (zone_name like '" . zen_db_input($state) . "%'
-                         or zone_code like '%" . zen_db_input($state) . "%')";
+                         and (BINARY zone_name like '" . zen_db_input($state) . "%'
+                         or BINARY zone_code like '%" . zen_db_input($state) . "%')";
 
           $zone = $db->Execute($zone_query);
 
diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-4/includes/modules/pages/checkout_shipping_address/header_php.php zen-cart-v1.2.0-l10n-jp-5/includes/modules/pages/checkout_shipping_address/header_php.php
--- zen-cart-v1.2.0-l10n-jp-4/includes/modules/pages/checkout_shipping_address/header_php.php	2004-12-04 13:24:20.000000000 +0900
+++ zen-cart-v1.2.0-l10n-jp-5/includes/modules/pages/checkout_shipping_address/header_php.php	2006-01-22 11:39:49.000000000 +0900
@@ -133,8 +133,8 @@
         if ($entry_state_has_zones == true) {
           $zone_query = "select distinct zone_id from " . TABLE_ZONES . "
                          where zone_country_id = '" . (int)$country . "'
-                         and (zone_name like '" . zen_db_input($state) . "%'
-                         or zone_code like '%" . zen_db_input($state) . "%')";
+                         and (BINARY zone_name like '" . zen_db_input($state) . "%'
+                         or BINARY zone_code like '%" . zen_db_input($state) . "%')";
 
           $zone = $db->Execute($zone_query);
 
diff -u -r -N -I '$Id' zen-cart-v1.2.0-l10n-jp-4/includes/modules/pages/create_account/header_php.php zen-cart-v1.2.0-l10n-jp-5/includes/modules/pages/create_account/header_php.php
--- zen-cart-v1.2.0-l10n-jp-4/includes/modules/pages/create_account/header_php.php	2005-01-12 18:16:22.000000000 +0900
+++ zen-cart-v1.2.0-l10n-jp-5/includes/modules/pages/create_account/header_php.php	2006-01-22 11:39:49.000000000 +0900
@@ -198,7 +198,7 @@
         $zone_query = "select distinct zone_id, zone_name
                        from " . TABLE_ZONES . "
                        where zone_country_id = '" . (int)$country . "'
-                       and zone_code =  '" . strtoupper(zen_db_input($state)) . "'";
+                       and BINARY zone_code =  '" . strtoupper(zen_db_input($state)) . "'";
 
         $zone = $db->Execute($zone_query);
         if ($zone->RecordCount() > 0) {
@@ -210,8 +210,8 @@
           $zone_query = "select distinct zone_id, zone_name
                          from " . TABLE_ZONES . "
                          where zone_country_id = '" . (int)$country . "'
-                         and (zone_name like '" . zen_db_input($state) . "%'
-                         or zone_code like '%" . zen_db_input($state) . "%')";
+                         and (BINARY zone_name like '" . zen_db_input($state) . "%'
+                         or BINARY zone_code like '%" . zen_db_input($state) . "%')";
 
           $zone = $db->Execute($zone_query);