mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-19 19:29:56 +09:00
Merge 1.5.2.3 (~r10623)
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10624 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
79fdf10866
commit
e4306a789f
915 changed files with 71076 additions and 245 deletions
|
|
@ -214,9 +214,8 @@
|
|||
* @param[in] $db_type type of db to check
|
||||
* @return true: is supported, false: is not supported
|
||||
**/
|
||||
function isSupported($db_type) {
|
||||
$supported_list = DB::getSupportedList();
|
||||
return in_array($db_type, $supported_list);
|
||||
function isSupported() {
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -634,7 +633,7 @@
|
|||
}
|
||||
|
||||
function _getConnection($type = 'master', $indx = NULL){
|
||||
if($type == master){
|
||||
if($type == 'master'){
|
||||
if(!$this->master_db['is_connected'])
|
||||
$this->_connect($type);
|
||||
$this->connection = 'Master ' . $this->master_db['db_hostname'];
|
||||
|
|
@ -767,7 +766,7 @@
|
|||
$this->use_prepared_statements = $db_info->use_prepared_statements;
|
||||
}
|
||||
|
||||
function __connect(){
|
||||
function __connect($connection){
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue