Fix undefined Typecho\Db\Adapter_Exception (#1334)
This commit is contained in:
+1
-1
@@ -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()));
|
||||
|
||||
@@ -305,7 +305,7 @@ class Request
|
||||
return $this->pathInfo;
|
||||
}
|
||||
|
||||
//参考Zend Framework对pahtinfo的处理, 更好的兼容性
|
||||
//参考Zend Framework对pathinfo的处理, 更好的兼容性
|
||||
$pathInfo = null;
|
||||
|
||||
//处理requestUri
|
||||
|
||||
Reference in New Issue
Block a user