From 222e64b841d7eaf927e6129d1d8b337c23358144 Mon Sep 17 00:00:00 2001 From: Kentaro Ohkouchi Date: Mon, 16 Dec 2024 17:20:27 +0900 Subject: [PATCH] =?UTF-8?q?MySQL8=20=E5=88=A9=E7=94=A8=E6=99=82=E3=81=AB?= =?UTF-8?q?=E6=97=A2=E5=AD=98=E3=83=86=E3=83=BC=E3=83=96=E3=83=AB=E3=81=AE?= =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=8C=E3=81=A7=E3=81=8D=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/install/index.php | 6 +++++- html/install/templates/install_frame.tpl | 6 ------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/html/install/index.php b/html/install/index.php index 609034fd53..353e645bcb 100644 --- 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 . '
'; // エラー文を取得する diff --git a/html/install/templates/install_frame.tpl b/html/install/templates/install_frame.tpl index 0e79287b1f..f5e99a6fb4 100644 --- a/html/install/templates/install_frame.tpl +++ b/html/install/templates/install_frame.tpl @@ -26,12 +26,6 @@ - - - -