Merge branch 'main' into docsblocks-1

OpenMage · Aug 22, 2024 · bd38b70 · bd38b70
2 parents ae3bfd5 + 9f1659d
commit bd38b70
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php b/app/code/core/Mage/Core/Helper/EnvironmentConfigLoader.php
@@ -68,14 +68,14 @@ public function overrideEnvironment(Varien_Simplexml_Config $xmlConfig)
 
             switch ($scope) {
                 case static::CONFIG_KEY_DEFAULT:
-                    list($_, $_, $section, $group, $field) = $configKeyParts;
+                    list($unused1, $unused2, $section, $group, $field) = $configKeyParts;
                     $path = $this->buildPath($section, $group, $field);
                     $xmlConfig->setNode($this->buildNodePath($scope, $path), $value);
                     break;
 
                 case static::CONFIG_KEY_WEBSITES:
                 case static::CONFIG_KEY_STORES:
-                    list($_, $_, $code, $section, $group, $field) = $configKeyParts;
+                    list($unused1, $unused2, $code, $section, $group, $field) = $configKeyParts;
                     $path = $this->buildPath($section, $group, $field);
                     $nodePath = sprintf('%s/%s/%s', strtolower($scope), strtolower($code), $path);
                     $xmlConfig->setNode($nodePath, $value);

diff --git a/composer.lock b/composer.lock