diff --git a/app/code/core/Mage/Core/Model/Config.php b/app/code/core/Mage/Core/Model/Config.php index b76ffd155b5..d6dbac903fd 100644 --- a/app/code/core/Mage/Core/Model/Config.php +++ b/app/code/core/Mage/Core/Model/Config.php @@ -27,6 +27,72 @@ */ class Mage_Core_Model_Config extends Mage_Core_Model_Config_Base { + const MAGE_MODULES = [ + 'Mage_Core' => 0, + 'Mage_Eav' => 1, + 'Mage_Page' => 2, + 'Mage_Install' => 3, + 'Mage_Admin' => 4, + 'Mage_Rule' => 5, + 'Mage_Adminhtml' => 6, + 'Mage_AdminNotification' => 7, + 'Mage_Cron' => 8, + 'Mage_Directory' => 9, + 'Mage_Dataflow' => 10, + 'Mage_Index' => 11, + 'Mage_Uploader' => 12, + 'Mage_Customer' => 13, + 'Mage_Cms' => 14, + 'Mage_Catalog' => 15, + 'Mage_CatalogRule' => 16, + 'Mage_CatalogIndex' => 17, + 'Mage_CatalogSearch' => 18, + 'Mage_Payment' => 19, + 'Mage_Sales' => 20, + 'Mage_CatalogInventory' => 21, + 'Mage_Shipping' => 22, + 'Mage_SalesRule' => 23, + 'Mage_Usa' => 24, + 'Mage_Paygate' => 25, + 'Mage_Backup' => 26, + 'Mage_Checkout' => 27, + 'Mage_Paypal' => 28, + 'Mage_GoogleCheckout' => 29, + 'Mage_Log' => 30, + 'Mage_Poll' => 31, + 'Mage_Review' => 32, + 'Mage_Rating' => 33, + 'Mage_Tag' => 34, + 'Mage_Reports' => 35, + 'Mage_GoogleAnalytics' => 36, + 'Mage_Widget' => 37, + 'Mage_Tax' => 38, + 'Mage_Wishlist' => 39, + 'Mage_Media' => 40, + 'Mage_PaypalUk' => 41, + 'Mage_Contacts' => 42, + 'Mage_GiftMessage' => 43, + 'Mage_Sendfriend' => 44, + 'Mage_Sitemap' => 45, + 'Mage_Rss' => 46, + 'Mage_ProductAlert' => 47, + 'Mage_Api' => 48, + 'Mage_Oauth' => 49, + 'Mage_Authorizenet' => 50, + 'Mage_Bundle' => 51, + 'Mage_Captcha' => 52, + 'Mage_Centinel' => 53, + 'Mage_ConfigurableSwatches' => 54, + 'Mage_Newsletter' => 55, + 'Mage_Downloadable' => 56, + 'Mage_ImportExport' => 57, + 'Mage_Api2' => 58, + 'Mage_PageCache' => 59, + 'Mage_Persistent' => 60, + 'Mage_Weee' => 61, + 'Mage_CurrencySymbol' => 62 + ]; + const CACHE_TAG = 'CONFIG'; /** @@ -724,7 +790,6 @@ protected function _getDeclaredModuleFiles() } $collectModuleFiles = [ - 'base' => [], 'mage' => [], 'custom' => [] ]; @@ -733,17 +798,16 @@ protected function _getDeclaredModuleFiles() $name = explode(DIRECTORY_SEPARATOR, $v); $name = substr($name[count($name) - 1], 0, -4); - if ($name == 'Mage_All') { - $collectModuleFiles['base'][] = $v; - } elseif (substr($name, 0, 5) == 'Mage_') { - $collectModuleFiles['mage'][] = $v; + if (array_key_exists($name, self::MAGE_MODULES)) { + $collectModuleFiles['mage'][self::MAGE_MODULES[$name]] = $v; } else { $collectModuleFiles['custom'][] = $v; } } + ksort($collectModuleFiles['mage']); + return array_merge( - $collectModuleFiles['base'], $collectModuleFiles['mage'], $collectModuleFiles['custom'] ); diff --git a/app/etc/modules/Mage_Admin.xml b/app/etc/modules/Mage_Admin.xml new file mode 100644 index 00000000000..48f6263f1f5 --- /dev/null +++ b/app/etc/modules/Mage_Admin.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_AdminNotification.xml b/app/etc/modules/Mage_AdminNotification.xml new file mode 100644 index 00000000000..b5cbaf57cb3 --- /dev/null +++ b/app/etc/modules/Mage_AdminNotification.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Adminhtml.xml b/app/etc/modules/Mage_Adminhtml.xml new file mode 100644 index 00000000000..d108e1cdc36 --- /dev/null +++ b/app/etc/modules/Mage_Adminhtml.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_All.xml b/app/etc/modules/Mage_All.xml index eb0a1225639..1fad1e6e010 100644 --- a/app/etc/modules/Mage_All.xml +++ b/app/etc/modules/Mage_All.xml @@ -1,402 +1,45 @@ - - - - true - core - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - - true - core - - - - - - - - - true - core - - - - - - - - true - core - - - - - - - - true - core - - - - - - true - core - - - - - - - - - true - core - - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - - - true - core - - - - - - - - - true - core - - - - - - - - true - core - - - - - - - false - core - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - - - true - core - - - - - - - - - true - core - - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - true - core - - - - - - - - - - true - core - - - - - - - true - core - - - - - - true - core - - - - - - + diff --git a/app/etc/modules/Mage_Api.xml b/app/etc/modules/Mage_Api.xml index 38be49e0cfc..f81d7e9c50b 100644 --- a/app/etc/modules/Mage_Api.xml +++ b/app/etc/modules/Mage_Api.xml @@ -25,7 +25,7 @@ true core - + diff --git a/app/etc/modules/Mage_Api2.xml b/app/etc/modules/Mage_Api2.xml index 8e039e1391b..ad0c86784d1 100644 --- a/app/etc/modules/Mage_Api2.xml +++ b/app/etc/modules/Mage_Api2.xml @@ -25,8 +25,8 @@ true core - - + + diff --git a/app/etc/modules/Mage_Authorizenet.xml b/app/etc/modules/Mage_Authorizenet.xml index ee61466ab06..95faaf17c32 100644 --- a/app/etc/modules/Mage_Authorizenet.xml +++ b/app/etc/modules/Mage_Authorizenet.xml @@ -25,9 +25,9 @@ true core + - diff --git a/app/etc/modules/Mage_Backup.xml b/app/etc/modules/Mage_Backup.xml new file mode 100644 index 00000000000..bdc344d44b0 --- /dev/null +++ b/app/etc/modules/Mage_Backup.xml @@ -0,0 +1,32 @@ + + + + + + false + core + + + + + + diff --git a/app/etc/modules/Mage_Bundle.xml b/app/etc/modules/Mage_Bundle.xml index d6a25efb539..3c94f8f82a7 100644 --- a/app/etc/modules/Mage_Bundle.xml +++ b/app/etc/modules/Mage_Bundle.xml @@ -25,7 +25,7 @@ true core - + diff --git a/app/etc/modules/Mage_Captcha.xml b/app/etc/modules/Mage_Captcha.xml index 831420ad603..06cc2e31fe9 100644 --- a/app/etc/modules/Mage_Captcha.xml +++ b/app/etc/modules/Mage_Captcha.xml @@ -25,10 +25,10 @@ true core - - - - + + + + diff --git a/app/etc/modules/Mage_Catalog.xml b/app/etc/modules/Mage_Catalog.xml new file mode 100644 index 00000000000..0faf4e7a3c0 --- /dev/null +++ b/app/etc/modules/Mage_Catalog.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_CatalogIndex.xml b/app/etc/modules/Mage_CatalogIndex.xml new file mode 100644 index 00000000000..790d784a710 --- /dev/null +++ b/app/etc/modules/Mage_CatalogIndex.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_CatalogInventory.xml b/app/etc/modules/Mage_CatalogInventory.xml new file mode 100644 index 00000000000..b9d9bd37bf7 --- /dev/null +++ b/app/etc/modules/Mage_CatalogInventory.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_CatalogRule.xml b/app/etc/modules/Mage_CatalogRule.xml new file mode 100644 index 00000000000..27bd49e296b --- /dev/null +++ b/app/etc/modules/Mage_CatalogRule.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_CatalogSearch.xml b/app/etc/modules/Mage_CatalogSearch.xml new file mode 100644 index 00000000000..8a1aa7109ef --- /dev/null +++ b/app/etc/modules/Mage_CatalogSearch.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Centinel.xml b/app/etc/modules/Mage_Centinel.xml index b5f9c2e4f96..77c03fca9b8 100644 --- a/app/etc/modules/Mage_Centinel.xml +++ b/app/etc/modules/Mage_Centinel.xml @@ -25,8 +25,8 @@ true core - + diff --git a/app/etc/modules/Mage_Checkout.xml b/app/etc/modules/Mage_Checkout.xml new file mode 100644 index 00000000000..d9d1d1db812 --- /dev/null +++ b/app/etc/modules/Mage_Checkout.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Cms.xml b/app/etc/modules/Mage_Cms.xml new file mode 100644 index 00000000000..ebe8ff8120a --- /dev/null +++ b/app/etc/modules/Mage_Cms.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_ConfigurableSwatches.xml b/app/etc/modules/Mage_ConfigurableSwatches.xml index bc756a67a73..68b7ef1892f 100644 --- a/app/etc/modules/Mage_ConfigurableSwatches.xml +++ b/app/etc/modules/Mage_ConfigurableSwatches.xml @@ -25,8 +25,8 @@ true core - - + + diff --git a/app/etc/modules/Mage_Contacts.xml b/app/etc/modules/Mage_Contacts.xml new file mode 100644 index 00000000000..77a637f2e39 --- /dev/null +++ b/app/etc/modules/Mage_Contacts.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Core.xml b/app/etc/modules/Mage_Core.xml new file mode 100644 index 00000000000..955fc7dc170 --- /dev/null +++ b/app/etc/modules/Mage_Core.xml @@ -0,0 +1,29 @@ + + + + + + true + core + + + diff --git a/app/etc/modules/Mage_Cron.xml b/app/etc/modules/Mage_Cron.xml new file mode 100644 index 00000000000..48aa15b1288 --- /dev/null +++ b/app/etc/modules/Mage_Cron.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Customer.xml b/app/etc/modules/Mage_Customer.xml new file mode 100644 index 00000000000..01012f9f3a4 --- /dev/null +++ b/app/etc/modules/Mage_Customer.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_Dataflow.xml b/app/etc/modules/Mage_Dataflow.xml new file mode 100644 index 00000000000..e266af97cbc --- /dev/null +++ b/app/etc/modules/Mage_Dataflow.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Directory.xml b/app/etc/modules/Mage_Directory.xml new file mode 100644 index 00000000000..cf2ce744a81 --- /dev/null +++ b/app/etc/modules/Mage_Directory.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Downloadable.xml b/app/etc/modules/Mage_Downloadable.xml index 0d9d4d64e89..3899f01a020 100644 --- a/app/etc/modules/Mage_Downloadable.xml +++ b/app/etc/modules/Mage_Downloadable.xml @@ -25,8 +25,7 @@ true core - - + diff --git a/app/etc/modules/Mage_Eav.xml b/app/etc/modules/Mage_Eav.xml new file mode 100644 index 00000000000..e2c88cb615d --- /dev/null +++ b/app/etc/modules/Mage_Eav.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_GiftMessage.xml b/app/etc/modules/Mage_GiftMessage.xml new file mode 100644 index 00000000000..ac4efaefd50 --- /dev/null +++ b/app/etc/modules/Mage_GiftMessage.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_GoogleAnalytics.xml b/app/etc/modules/Mage_GoogleAnalytics.xml new file mode 100644 index 00000000000..718b5457ccd --- /dev/null +++ b/app/etc/modules/Mage_GoogleAnalytics.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_GoogleCheckout.xml b/app/etc/modules/Mage_GoogleCheckout.xml new file mode 100644 index 00000000000..b973010c23d --- /dev/null +++ b/app/etc/modules/Mage_GoogleCheckout.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_Index.xml b/app/etc/modules/Mage_Index.xml new file mode 100644 index 00000000000..7ff9b603ecf --- /dev/null +++ b/app/etc/modules/Mage_Index.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Install.xml b/app/etc/modules/Mage_Install.xml new file mode 100644 index 00000000000..9b21b6ac25e --- /dev/null +++ b/app/etc/modules/Mage_Install.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Log.xml b/app/etc/modules/Mage_Log.xml new file mode 100644 index 00000000000..ff75e3a2fb9 --- /dev/null +++ b/app/etc/modules/Mage_Log.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Media.xml b/app/etc/modules/Mage_Media.xml new file mode 100644 index 00000000000..3a49ab4890c --- /dev/null +++ b/app/etc/modules/Mage_Media.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Newsletter.xml b/app/etc/modules/Mage_Newsletter.xml new file mode 100644 index 00000000000..aba2e8d9725 --- /dev/null +++ b/app/etc/modules/Mage_Newsletter.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_Page.xml b/app/etc/modules/Mage_Page.xml new file mode 100644 index 00000000000..4c07d013c15 --- /dev/null +++ b/app/etc/modules/Mage_Page.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Paygate.xml b/app/etc/modules/Mage_Paygate.xml new file mode 100644 index 00000000000..d1455aa98ad --- /dev/null +++ b/app/etc/modules/Mage_Paygate.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Payment.xml b/app/etc/modules/Mage_Payment.xml new file mode 100644 index 00000000000..faecbc54a86 --- /dev/null +++ b/app/etc/modules/Mage_Payment.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Paypal.xml b/app/etc/modules/Mage_Paypal.xml new file mode 100644 index 00000000000..99b53409969 --- /dev/null +++ b/app/etc/modules/Mage_Paypal.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_PaypalUk.xml b/app/etc/modules/Mage_PaypalUk.xml new file mode 100644 index 00000000000..b5030ede121 --- /dev/null +++ b/app/etc/modules/Mage_PaypalUk.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_Persistent.xml b/app/etc/modules/Mage_Persistent.xml index 424082060f8..a4a13dc11ba 100644 --- a/app/etc/modules/Mage_Persistent.xml +++ b/app/etc/modules/Mage_Persistent.xml @@ -25,8 +25,8 @@ true core - - + + diff --git a/app/etc/modules/Mage_Poll.xml b/app/etc/modules/Mage_Poll.xml new file mode 100644 index 00000000000..4dbd700493b --- /dev/null +++ b/app/etc/modules/Mage_Poll.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_ProductAlert.xml b/app/etc/modules/Mage_ProductAlert.xml new file mode 100644 index 00000000000..9e021b39d1a --- /dev/null +++ b/app/etc/modules/Mage_ProductAlert.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Rating.xml b/app/etc/modules/Mage_Rating.xml new file mode 100644 index 00000000000..af78ea9dc3c --- /dev/null +++ b/app/etc/modules/Mage_Rating.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Reports.xml b/app/etc/modules/Mage_Reports.xml new file mode 100644 index 00000000000..f8f8c7b2f36 --- /dev/null +++ b/app/etc/modules/Mage_Reports.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_Review.xml b/app/etc/modules/Mage_Review.xml new file mode 100644 index 00000000000..417c1708f80 --- /dev/null +++ b/app/etc/modules/Mage_Review.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Rss.xml b/app/etc/modules/Mage_Rss.xml new file mode 100644 index 00000000000..34d10429fcb --- /dev/null +++ b/app/etc/modules/Mage_Rss.xml @@ -0,0 +1,36 @@ + + + + + + true + core + + + + + + + + + + diff --git a/app/etc/modules/Mage_Rule.xml b/app/etc/modules/Mage_Rule.xml new file mode 100644 index 00000000000..14f53bf140b --- /dev/null +++ b/app/etc/modules/Mage_Rule.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Sales.xml b/app/etc/modules/Mage_Sales.xml new file mode 100644 index 00000000000..2f0b31be4a3 --- /dev/null +++ b/app/etc/modules/Mage_Sales.xml @@ -0,0 +1,35 @@ + + + + + + true + core + + + + + + + + + diff --git a/app/etc/modules/Mage_SalesRule.xml b/app/etc/modules/Mage_SalesRule.xml new file mode 100644 index 00000000000..2dfc961eb6a --- /dev/null +++ b/app/etc/modules/Mage_SalesRule.xml @@ -0,0 +1,34 @@ + + + + + + true + core + + + + + + + + diff --git a/app/etc/modules/Mage_Sendfriend.xml b/app/etc/modules/Mage_Sendfriend.xml new file mode 100644 index 00000000000..31a23bb72b6 --- /dev/null +++ b/app/etc/modules/Mage_Sendfriend.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Shipping.xml b/app/etc/modules/Mage_Shipping.xml new file mode 100644 index 00000000000..4509b6d5a1d --- /dev/null +++ b/app/etc/modules/Mage_Shipping.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Sitemap.xml b/app/etc/modules/Mage_Sitemap.xml new file mode 100644 index 00000000000..1f6d21024ed --- /dev/null +++ b/app/etc/modules/Mage_Sitemap.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Tag.xml b/app/etc/modules/Mage_Tag.xml new file mode 100644 index 00000000000..5763eb40812 --- /dev/null +++ b/app/etc/modules/Mage_Tag.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Tax.xml b/app/etc/modules/Mage_Tax.xml new file mode 100644 index 00000000000..3dfeb3de677 --- /dev/null +++ b/app/etc/modules/Mage_Tax.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Uploader.xml b/app/etc/modules/Mage_Uploader.xml new file mode 100644 index 00000000000..9c26f23dd4b --- /dev/null +++ b/app/etc/modules/Mage_Uploader.xml @@ -0,0 +1,32 @@ + + + + + + true + core + + + + + + diff --git a/app/etc/modules/Mage_Usa.xml b/app/etc/modules/Mage_Usa.xml new file mode 100644 index 00000000000..8a5583f203b --- /dev/null +++ b/app/etc/modules/Mage_Usa.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + + diff --git a/app/etc/modules/Mage_Weee.xml b/app/etc/modules/Mage_Weee.xml index cef07bfbca6..aeca6b88217 100644 --- a/app/etc/modules/Mage_Weee.xml +++ b/app/etc/modules/Mage_Weee.xml @@ -25,9 +25,9 @@ true core - - - + + + diff --git a/app/etc/modules/Mage_Widget.xml b/app/etc/modules/Mage_Widget.xml index 6a7ab827a23..de8991f2294 100644 --- a/app/etc/modules/Mage_Widget.xml +++ b/app/etc/modules/Mage_Widget.xml @@ -25,7 +25,7 @@ true core - + diff --git a/app/etc/modules/Mage_Wishlist.xml b/app/etc/modules/Mage_Wishlist.xml new file mode 100644 index 00000000000..059a35fe1f4 --- /dev/null +++ b/app/etc/modules/Mage_Wishlist.xml @@ -0,0 +1,33 @@ + + + + + + true + core + + + + + + +