changed admin/design/theme to admin/desing/use_legacy_theme and added…

… default value
OpenMage · Jun 12, 2020 · 47025d7 · 47025d7
1 parent 9dbbc16
commit 47025d7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/app/code/core/Mage/Adminhtml/Controller/Action.php b/app/code/core/Mage/Adminhtml/Controller/Action.php
@@ -150,7 +150,7 @@ protected function _addJs(Mage_Core_Block_Abstract $block)
     public function preDispatch()
     {
         // get legacy theme choice form backend config
-        if (Mage::getStoreConfigFlag('admin/design/theme')) {
+        if (Mage::getStoreConfigFlag('admin/design/use_legacy_theme')) {
             $theme = Mage::getConfig()->getNode("stores/admin/design/theme/default");
         } else {
             $theme = Mage::getConfig()->getNode("stores/admin/design/theme/openmage");

diff --git a/app/code/core/Mage/Adminhtml/etc/config.xml b/app/code/core/Mage/Adminhtml/etc/config.xml
@@ -233,6 +233,11 @@
         <help>
             <target_version>ce</target_version>
         </help>
+        <admin>
+            <design>
+                <use_legacy_theme>0</use_legacy_theme>
+            </design>
+        </admin>
     </default>
     <stores>
         <admin>

diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
@@ -1066,14 +1066,14 @@
                     <show_in_website>0</show_in_website>
                     <show_in_store>0</show_in_store>
                     <fields>
-                        <theme translate="label comment">
+                        <use_legacy_theme translate="label comment">
                             <label>Enable legacy Admin Theme</label>
                             <comment>Use legacy theme from Magento CE</comment>
                             <frontend_type>select</frontend_type>
                             <source_model>adminhtml/system_config_source_yesno</source_model>
                             <sort_order>1</sort_order>
                             <show_in_default>1</show_in_default>
-                        </theme>
+                        </use_legacy_theme>
                     </fields>
                 </design>