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

Merge branch 'develop' into next

Browse source
This commit is contained in:
Kijin Sung 2020-06-12 10:28:36 +09:00
commit f01fb9ae42
11 changed files with 41 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/context/Context.class.php
View file

@ -499,7 +499,7 @@ class Context
{
$config = Rhymix\Framework\Config::getAll();
}
if (!count($config))
if (!is_array($config) || !count($config))
{
self::$_instance->db_info = self::$_instance->db_info ?: new stdClass;
return;

2
classes/db/DB.class.php
View file

@ -902,7 +902,7 @@ class DB
*/
public function _dbInfoExists()
{
return ($this->master_db && count($this->slave_db));
return $this->master_db ? true : false;
}
/**

2
classes/db/queryparts/Query.class.php
View file

@ -149,7 +149,9 @@ class Query extends BaseObject
function setColumnList($columnList)
{
if (!is_array($this->columnList)) return;
$this->columnList = $columnList;
if(count($this->columnList) > 0)
{
$selectColumns = array();