Changeset 6262 for temp/trunk/html

Timestamp:

2006/10/13 13:14:41 (20 years ago)

Author:

naka

Message:

* empty log message *

File:

• temp/trunk/html/install/index.php (modified) (2 diffs)

temp/trunk/html/install/index.php

@@ -533 +533 @@
         $options['debug'] = PEAR_DB_DEBUG;
         $objDB = DB::connect($dsn, $options);
-        // Àܳ¥¨¥é¡¼
-        if(PEAR::isError($objDB)) {
+        // ÀܳÀ®¸ù
+        if(!PEAR::isError($objDB)) {
+            // ¥Ç¡¼¥¿¥Ù¡¼¥¹¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤Î¼èÆÀ
+            $objPage->tpl_db_version = sfGetDBVersion($dsn);            
+        } else {
             $objErr->arrErr['all'] = ">> " . $objDB->message . "<br>";
             // ¥¨¥é¡¼Ê¸¤ò¼èÆÀ¤¹¤ë
@@ -540 +543 @@
             $objErr->arrErr['all'].= $arrKey[0] . "<br>";
             gfPrintLog($objDB->userinfo, "./temp/install.log");
-        } else {
-            if($arrRet['db_type'] == 'mysql') {
-                $arrRet = $objDB->getAll("SHOW VARIABLES");
-                foreach($arrRet as $array) {
-                    if($array[0] == 'version') {
-                        $objPage->tpl_db_version = "MySQL " . $array[1];
-                    }
-                }
-            }
-            if($arrRet['db_type'] == 'pgsql') {
-                $arrRet = $objDB->getAll("select version()");
-                $arrLine = split(" " , $arrRet[0][0]);
-                $objPage->tpl_db_version = $arrLine[0] . " " . $arrLine[1];
-            }
         }
     }