fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +09:00
Code Issues Projects Releases Packages Wiki Activity

Clean up references to deprecated DB methods in other places

Browse source
This commit is contained in:
Kijin Sung 2023-06-19 15:24:27 +09:00
parent 59113fc385
commit 959503b6ec
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/module/ModuleHandler.class.php
View file

@ -992,7 +992,7 @@ class ModuleHandler extends Handler
}
// If connection to DB has a problem even though it's not install module, set error
if($this->module != 'install' && !DB::getInstance()->isConnected())
if($this->module != 'install' && !DB::getInstance()->getHandle())
{
$this->error = 'msg_dbconnect_failed';
}

8
modules/install/install.controller.php
View file

@ -52,7 +52,7 @@ class installController extends install
// Check connection to the DB.
$oDB = DB::getInstance();
$output = $oDB->getError();
if (!$output->toBool() || !$oDB->isConnected())
if (!$output->toBool() || !$oDB->getHandle())
{
return $output;
}
@ -61,7 +61,7 @@ class installController extends install
if(stripos($config->db_type, 'mysql') !== false)
{
// Check if InnoDB is supported.
$show_engines = $oDB->_fetch($oDB->_query('SHOW ENGINES'));
$show_engines = $oDB->query('SHOW ENGINES')->fetchAll();
foreach($show_engines as $engine_info)
{
if ($engine_info->Engine === 'InnoDB' && $engine_info->Support !== 'NO')
@ -209,8 +209,8 @@ class installController extends install
Context::loadDBInfo($config);
// Check DB.
$oDB = DB::getInstance();
if (!$oDB->isConnected())
$oDB = DB::getInstance('master');
if (!$oDB->getHandle())
{
return $oDB->getError();
}