restore sysconfig original behavior (OpenMage#17)

empiricompany · Aug 8, 2023 · a5941cd · a5941cd
1 parent d739ce3
commit a5941cd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php b/app/code/core/Mage/Adminhtml/Block/System/Config/Form.php
@@ -335,8 +335,8 @@ public function initFields($fieldset, $group, $section, $fieldPrefix = '', $labe
                             . $dependentFieldNameValue;
                         $shouldBeAddedDependence = true;
                         $dependentValue = (string)(isset($dependent->value) ? $dependent->value : $dependent);
-                        if (isset($dependent->separator)) {
-                            $dependentValue = explode((string)$dependent->separator, $dependentValue);
+                        if (isset($dependent['separator'])) {
+                            $dependentValue = explode((string)$dependent['separator'], $dependentValue);
                         }
                         $dependentFieldName = $fieldPrefix . $dependent->getName();
                         $dependentField     = $dependentFieldGroup->fields->$dependentFieldName;

diff --git a/app/code/core/Mage/Cms/etc/system.xml b/app/code/core/Mage/Cms/etc/system.xml
@@ -93,9 +93,8 @@
                             <show_in_website>1</show_in_website>
                             <show_in_store>1</show_in_store>
                             <depends>
-                                <enabled>
+                                <enabled separator="|">
                                     <value>enabled|hidden</value>
-                                    <separator>|</separator>
                                 </enabled>
                             </depends>
                         </skin>