Changeset 5438 for temp

Timestamp:

2006/09/22 13:51:56 (20 years ago)

Author:

kakinaka

Message:

blank

File:

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

temp/trunk/html/install/index.php

@@ -67 +67 @@
 // ¥Ç¡¼¥¿¥Ù¡¼¥¹¤ÎÀßÄê
 case 'step2':
-
     //ÆþÎÏÃͤΥ¨¥é¡¼¥Á¥§¥Ã¥¯
     $objPage->arrErr = lfCheckDBError($objDBParam);
     if(count($objPage->arrErr) == 0) {
-        
-        // ŹÊÞ¤òÊѹ¹¤·¤Ê¤¤¾ì¹ç¤Ë¤Ï´°Î»²èÌ̤ØÁ«°Ü
-        $skip = $_POST["db_skip"];
-        if ($skip == "on") {
-            // ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀ¸À®
-            lfMakeConfigFile();
-            $objPage = lfDispComplete($objPage);
-            break;
-        }
-        
         $objPage = lfDispStep3($objPage);
-
     } else {
         $objPage = lfDispStep2($objPage);
@@ -91 +79 @@
     // ÆþÎϥǡ¼¥¿¤òÅϤ¹¡£
     $arrRet =  $objDBParam->getHashArray();
-
+    
+    $skip = $_POST["db_skip"];
+
+    // ¥¹¥­¥Ã¥×¤¹¤ë¾ì¹ç¤Ë¤Ï´°Î»²èÌ̤ØÁ«°Ü
+    if ($skip == "on") {
+        // ÀßÄê¥Õ¥¡¥¤¥ë¤ÎÀ¸À®
+        lfMakeConfigFile();
+        $objPage = lfDispComplete($objPage);
+        break;
+    }
+    
     // ¥Æ¡¼¥Ö¥ë¤ÎºîÀ®
     $objPage->arrErr = lfExecuteSQL("./create_table_".$arrRet['db_type'].".sql", $arrRet['db_user'], $arrRet['db_password'], $arrRet['db_server'], $arrRet['db_name'], $arrRet['db_type'], $arrRet['db_port']);