From 05e9e0879d6e1862e2b8d9bef9c1fa4337d86fdf Mon Sep 17 00:00:00 2001
From: Fabrice Creuzot <code@luigifab.fr>
Date: Fri, 12 Mar 2021 13:00:06 +0100
Subject: [PATCH] Remove admin router compatibility

---
 .../core/Mage/Core/Controller/Varien/Router/Admin.php  |  5 +----
 app/code/core/Mage/Core/etc/config.xml                 |  1 -
 app/code/core/Mage/Core/etc/system.xml                 | 10 ----------
 app/locale/en_US/Mage_Core.csv                         |  2 --
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
index 94d8f442421..cdc51d89453 100644
--- a/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
+++ b/app/code/core/Mage/Core/Controller/Varien/Router/Admin.php
@@ -137,13 +137,10 @@ public function collectRoutes($configArea, $useRouterName)
      */
     public function addModule($frontName, $moduleName, $routeName)
     {
-        $isExtensionsCompatibilityMode = (bool)(string)Mage::getConfig()->getNode(
-            'default/admin/security/extensions_compatibility_mode'
-        );
         $configRouterFrontName = (string)Mage::getConfig()->getNode(
             Mage_Adminhtml_Helper_Data::XML_PATH_ADMINHTML_ROUTER_FRONTNAME
         );
-        if ($isExtensionsCompatibilityMode || ($frontName == $configRouterFrontName)) {
+        if ($frontName == $configRouterFrontName) {
             return parent::addModule($frontName, $moduleName, $routeName);
         } else {
             return $this;
diff --git a/app/code/core/Mage/Core/etc/config.xml b/app/code/core/Mage/Core/etc/config.xml
index 630fd978cfb..37f7f48b772 100644
--- a/app/code/core/Mage/Core/etc/config.xml
+++ b/app/code/core/Mage/Core/etc/config.xml
@@ -437,7 +437,6 @@
                 <use_form_key>1</use_form_key>
                 <domain_policy_backend>2</domain_policy_backend>
                 <domain_policy_frontend>2</domain_policy_frontend>
-                <extensions_compatibility_mode>1</extensions_compatibility_mode>
                 <session_cookie_lifetime>10800</session_cookie_lifetime>
                 <secure_system_configuration_save_disabled>0</secure_system_configuration_save_disabled>
             </security>
diff --git a/app/code/core/Mage/Core/etc/system.xml b/app/code/core/Mage/Core/etc/system.xml
index ec3aaa42a69..cdc1353b5d5 100644
--- a/app/code/core/Mage/Core/etc/system.xml
+++ b/app/code/core/Mage/Core/etc/system.xml
@@ -1289,16 +1289,6 @@
                             <show_in_website>0</show_in_website>
                             <show_in_store>0</show_in_store>
                         </domain_policy_frontend>
-                        <extensions_compatibility_mode translate="label comment">
-                            <label>Admin routing compatibility mode for extensions</label>
-                            <comment>Enabling this setting increases risk of automated attacks against admin functionality.</comment>
-                            <frontend_type>select</frontend_type>
-                            <sort_order>6</sort_order>
-                            <source_model>adminhtml/system_config_source_enabledisable</source_model>
-                            <show_in_default>1</show_in_default>
-                            <show_in_website>0</show_in_website>
-                            <show_in_store>0</show_in_store>
-                        </extensions_compatibility_mode>
                         <crate_admin_user_notification translate="label comment">
                             <label>New Admin User Create Notification</label>
                             <comment>This setting enable notification when new admin user created.</comment>
diff --git a/app/locale/en_US/Mage_Core.csv b/app/locale/en_US/Mage_Core.csv
index 0f0bfc66135..0fc66ac04ef 100644
--- a/app/locale/en_US/Mage_Core.csv
+++ b/app/locale/en_US/Mage_Core.csv
@@ -12,7 +12,6 @@
 "Admin","Admin"
 "Admin Base URL","Admin Base URL"
 "Admin User Emails","Admin User Emails"
-"Admin routing compatibility mode for extensions","Admin routing compatibility mode for extensions"
 "Advanced","Advanced"
 "After selecting a new media storage location, press the Synchronize button
                                 to transfer all media to that location. Media will not be available in the new
@@ -131,7 +130,6 @@
 "Enabled for Admin","Enabled for Admin"
 "Enabled for Frontend","Enabled for Frontend"
 "Enabling ability to run Magento in a frame is not recommended for security reasons.","Enabling ability to run Magento in a frame is not recommended for security reasons."
-"Enabling this setting increases risk of automated attacks against admin functionality.","Enabling this setting increases risk of automated attacks against admin functionality."
 "Environment Update Time","Environment Update Time"
 "Error in file: ""%s"" - %s","Error in file: ""%s"" - %s"
 "European Union Countries","European Union Countries"