L5

macopedia · Dec 30, 2022 · 1d22a56 · 1d22a56
1 parent 1a50f4e
commit 1d22a56
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/src/Config/MagentoCore.php b/src/Config/MagentoCore.php
@@ -280,12 +280,12 @@ public function loadModules()
      * Iterate all active modules "etc" folders and combine data from
      * specified xml file name to one object
      *
-     * @param string $fileName
+     * @param array $fileName
      * @param null|\Mage_Core_Model_Config_Base $mergeToObject
      * @param null $mergeModel
      * @return \Mage_Core_Model_Config_Base
      */
-    public function loadModulesConfiguration($fileName, $mergeToObject = null, $mergeModel = null)
+    public function loadModulesConfiguration(array $fileName, $mergeToObject = null, $mergeModel = null)
     {
         if ($mergeToObject === null) {
             $mergeToObject = clone $this->_prototype;
@@ -301,9 +301,6 @@ public function loadModulesConfiguration($fileName, $mergeToObject = null, $merg
                 if ((string)$module->codePool === 'local') {
                     continue;
                 }
-                if (!is_array($fileName)) {
-                    $fileName = [$fileName];
-                }
 
                 foreach ($fileName as $configFile) {
                     $configFile = $this->getModuleDir('etc', $modName) . DS . $configFile;