MySQL8 利用時に既存テーブルの削除ができないのを修正

EC-CUBE · Dec 16, 2024 · 222e64b · 222e64b
1 parent b10fad0
commit 222e64b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/html/install/index.php b/html/install/index.php
@@ -867,7 +867,11 @@ function lfExecuteSQL($filepath, $arrDsn, $disp_err = true)
                         $dbFactory = SC_DB_DBFactory_Ex::getInstance($arrDsn['phptype']);
                         $val = $dbFactory->sfChangeReservedWords($val);
                     }
-                    $ret = $objDB->query($val);
+                    try {
+                        $ret = $objDB->query($val);
+                    } catch (Exception $e) {
+                        $ret = new MDB2_Error();
+                    }
                     if (PEAR::isError($ret) && $disp_err) {
                         $arrErr['all'] = '>> ' . $ret->message . '<br />';
                         // エラー文を取得する

diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl
@@ -26,12 +26,6 @@
 <meta http-equiv="content-script-type" content="text/javascript" />
 <meta http-equiv="content-style-type" content="text/css" />
 <link rel="stylesheet" href="css/admin_contents.css" type="text/css" media="all" />
-<!--[if lt IE 9]>
-<script src="../js/jquery-1.11.1.min.js"></script>
-<![endif]-->
-<!--[if gte IE 9]><!-->
-<script src="../js/jquery-2.1.1.min.js"></script>
-<!--<![endif]-->
 <script type="text/javascript" src="../js/eccube.js"></script>
 
 <script type="text/javascript">//<![CDATA[