Merge pull request #131 from razbakov/patch-1

fix Warning: array_merge()
ho-nl · Oct 24, 2016 · e80f9ac · e80f9ac
2 parents b6ef45d + e3172dc
commit e80f9ac
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/code/community/Ho/Import/Model/Import.php b/app/code/community/Ho/Import/Model/Import.php
@@ -828,7 +828,9 @@ public function getSourceAdapter()
         $this->_runEvent('source_adapter_before', $this->getProfile());
         $this->_getLog()->log($this->_getLog()->__('Getting source adapter %s', $source->getAttribute('model')));
         $importData = $this->getImportData();
-        $arguments = array_merge($arguments, is_null($importData) ? [] : $importData);
+        if (is_array($arguments)) {
+            $arguments = array_merge($arguments, is_null($importData) ? [] : $importData);
+        }
         $this->_sourceAdapter = Mage::getModel($source->getAttribute('model'), $arguments);
 
         if (!$this->_sourceAdapter) {