From 17fcb2f08b5dd1efe84877143c901c741ba2e938 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B2=88=E5=94=81?= <52o@qq52o.cn> Date: Tue, 15 Mar 2022 16:09:32 +0800 Subject: [PATCH] Fix undefined Typecho\Db\Adapter_Exception (#1334) --- install.php | 2 +- var/Typecho/Request.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/install.php b/install.php index 0a257eb7..13783676 100644 --- a/install.php +++ b/install.php @@ -1051,7 +1051,7 @@ function install_step_2_perform() $installDb = new \Typecho\Db($config['dbAdapter'], $config['dbPrefix']); $installDb->addServer($dbConfig, \Typecho\Db::READ | \Typecho\Db::WRITE); $installDb->query('SELECT 1=1'); - } catch (\Typecho\Db\Adapter_Exception $e) { + } catch (\Typecho\Db\Adapter\ConnectionException $e) { install_raise_error(_t('对不起, 无法连接数据库, 请先检查数据库配置再继续进行安装')); } catch (\Typecho\Db\Exception $e) { install_raise_error(_t('安装程序捕捉到以下错误: " %s ". 程序被终止, 请检查您的配置信息.', $e->getMessage())); diff --git a/var/Typecho/Request.php b/var/Typecho/Request.php index 5e28e2de..2fddd265 100644 --- a/var/Typecho/Request.php +++ b/var/Typecho/Request.php @@ -305,7 +305,7 @@ class Request return $this->pathInfo; } - //参考Zend Framework对pahtinfo的处理, 更好的兼容性 + //参考Zend Framework对pathinfo的处理, 更好的兼容性 $pathInfo = null; //处理requestUri