diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index f29ad60ed..79afd3eb5 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -500,7 +500,7 @@ class Context
{
$config = Rhymix\Framework\Config::getAll();
}
- if (!count($config))
+ if (!is_countable($config) || !count($config))
{
self::$_instance->db_info = self::$_instance->db_info ?: new stdClass;
return;
diff --git a/classes/db/queryparts/Query.class.php b/classes/db/queryparts/Query.class.php
index 229a3b8fc..2809427dc 100644
--- a/classes/db/queryparts/Query.class.php
+++ b/classes/db/queryparts/Query.class.php
@@ -150,6 +150,8 @@ class Query extends BaseObject
function setColumnList($columnList)
{
$this->columnList = $columnList;
+ if (!is_countable($this->columnList)) return;
+
if(count($this->columnList) > 0)
{
$selectColumns = array();
diff --git a/classes/display/JSONDisplayHandler.php b/classes/display/JSONDisplayHandler.php
index 7e7fc61a1..b960993c9 100644
--- a/classes/display/JSONDisplayHandler.php
+++ b/classes/display/JSONDisplayHandler.php
@@ -60,6 +60,10 @@ class JSONDisplayHandler
*/
protected static function _isNumericArray($array)
{
+ if (!is_countable($array))
+ {
+ return false;
+ }
if (!is_array($array) || !count($array))
{
return false;
diff --git a/common/functions.php b/common/functions.php
index 0e14e729d..747d1ecdd 100644
--- a/common/functions.php
+++ b/common/functions.php
@@ -691,4 +691,20 @@ function is_empty_html_content($str)
$str = strip_tags($str, '![]()