Changeset 20856

Timestamp:

2011/04/18 13:22:34 (12 years ago)

Author:

tao

Message:

refs #1246 PHP4の為に$collationを指定ない様に修正

Location:

branches/version-2_11-dev

Files:

• data/class/SC_Query.php (modified) (1 diff)
• html/install/index.php (modified) (1 diff)

branches/version-2_11-dev/data/class/SC_Query.php

@@ -77 +77 @@
         }
         if (!PEAR::isError($this->conn)) {
-            $this->conn->setCharset(array("utf8","utf8_general_ci"));
+            $this->conn->setCharset("utf8");
             $this->conn->setFetchMode(MDB2_FETCHMODE_ASSOC);
         }

branches/version-2_11-dev/html/install/index.php

@@ -795 +795 @@
         // 接続エラー
         if(!PEAR::isError($objDB)) {
-            if($objDB->dbsyntax == "mysql"){
-                $objDB->setCharset(array("utf-8","utf8_general_ci"));
-            }
+            $objDB->setCharset("utf8");
             $sql_split = split(";",$sql);
             foreach($sql_split as $key => $val){