diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 7a1e4a854..02930c18f 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -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;
diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index 244f73f1d..e325b185d 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -902,7 +902,7 @@ class DB
*/
public function _dbInfoExists()
{
- return ($this->master_db && count($this->slave_db));
+ return $this->master_db ? true : false;
}
/**
diff --git a/classes/db/queryparts/Query.class.php b/classes/db/queryparts/Query.class.php
index 229a3b8fc..968bb2b3e 100644
--- a/classes/db/queryparts/Query.class.php
+++ b/classes/db/queryparts/Query.class.php
@@ -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();
diff --git a/common/functions.php b/common/functions.php
index 0e14e729d..1100a75f5 100644
--- a/common/functions.php
+++ b/common/functions.php
@@ -691,4 +691,21 @@ function is_empty_html_content($str)
$str = strip_tags($str, '![]()