diff --git a/includes/FeedsConfigurable.inc b/includes/FeedsConfigurable.inc index 67bf748..7549d7b 100644 --- a/includes/FeedsConfigurable.inc +++ b/includes/FeedsConfigurable.inc @@ -112,7 +112,7 @@ abstract class FeedsConfigurable { */ public function setConfig($config) { $defaults = $this->configDefaults(); - $this->config = array_intersect_key($config, $defaults) + $defaults; + $this->config = array_intersect_key((array) $config, $defaults) + $defaults; } /** @@ -123,7 +123,7 @@ abstract class FeedsConfigurable { * returned by configDefaults(). */ public function addConfig($config) { - $this->config = array_merge($this->config, $config); + $this->config = array_merge($this->config, (array) $config); $default_keys = $this->configDefaults(); $this->config = array_intersect_key($this->config, $default_keys); }