diff --git a/administrator/components/com_menus/Helper/MenusHelper.php b/administrator/components/com_menus/Helper/MenusHelper.php index cc0dd744efda2..d904fc0f943f8 100644 --- a/administrator/components/com_menus/Helper/MenusHelper.php +++ b/administrator/components/com_menus/Helper/MenusHelper.php @@ -614,8 +614,8 @@ public static function getPresets() // Important: 'null' will cause infinite recursion. static::$presets = array(); - static::addPreset('joomla', 'JLIB_MENUS_PRESET_JOOMLA', JPATH_ADMINISTRATOR . '/components/com_menus/presets/joomla.xml'); - static::addPreset('modern', 'JLIB_MENUS_PRESET_MODERN', JPATH_ADMINISTRATOR . '/components/com_menus/presets/modern.xml'); + static::addPreset('default', 'JLIB_MENUS_PRESET_DEFAULT', JPATH_ADMINISTRATOR . '/components/com_menus/presets/default.xml'); + static::addPreset('alternate', 'JLIB_MENUS_PRESET_ALTERNATE', JPATH_ADMINISTRATOR . '/components/com_menus/presets/alternate.xml'); static::addPreset('system', 'JLIB_MENUS_PRESET_SYSTEM', JPATH_ADMINISTRATOR . '/components/com_menus/presets/system.xml'); static::addPreset('content', 'JLIB_MENUS_PRESET_CONTENT', JPATH_ADMINISTRATOR . '/components/com_menus/presets/content.xml'); static::addPreset('help', 'JLIB_MENUS_PRESET_HELP', JPATH_ADMINISTRATOR . '/components/com_menus/presets/help.xml'); @@ -668,9 +668,9 @@ public static function loadPreset($name, $fallback = true, $parent = null) { static::loadXml($xml, $parent); } - elseif ($fallback && isset($presets['joomla'])) + elseif ($fallback && isset($presets['default'])) { - if (($xml = simplexml_load_file($presets['joomla']->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement) + if (($xml = simplexml_load_file($presets['default']->path, null, LIBXML_NOCDATA)) && $xml instanceof \SimpleXMLElement) { static::loadXml($xml, $parent); } diff --git a/administrator/components/com_menus/presets/modern.xml b/administrator/components/com_menus/presets/alternate.xml similarity index 100% rename from administrator/components/com_menus/presets/modern.xml rename to administrator/components/com_menus/presets/alternate.xml diff --git a/administrator/components/com_menus/presets/joomla.xml b/administrator/components/com_menus/presets/default.xml similarity index 100% rename from administrator/components/com_menus/presets/joomla.xml rename to administrator/components/com_menus/presets/default.xml diff --git a/administrator/language/en-GB/en-GB.lib_joomla.ini b/administrator/language/en-GB/en-GB.lib_joomla.ini index 57bc2e66c8f7c..0656313e1de48 100644 --- a/administrator/language/en-GB/en-GB.lib_joomla.ini +++ b/administrator/language/en-GB/en-GB.lib_joomla.ini @@ -680,12 +680,12 @@ JLIB_MEDIA_ERROR_WARNINVALID_MIME="Invalid mime type detected." JLIB_MEDIA_ERROR_WARNINVALID_MIMETYPE="Illegal mime type detected: %s" JLIB_MEDIA_ERROR_WARNNOTADMIN="Uploaded file is not an image file and you do not have permission." +JLIB_MENUS_PRESET_ALTERNATE="Preset - Alternative Main Menu" JLIB_MENUS_PRESET_COMPONENTS="Preset - Components Dashboard" JLIB_MENUS_PRESET_CONTENT="Preset - Content Dashboard" +JLIB_MENUS_PRESET_DEFAULT="Preset - Joomla Main Menu" JLIB_MENUS_PRESET_HELP="Preset - Help Dashboard" -JLIB_MENUS_PRESET_JOOMLA="Preset - Joomla" JLIB_MENUS_PRESET_MENUS="Preset - Menus Dashboard" -JLIB_MENUS_PRESET_MODERN="Preset - Modern" JLIB_MENUS_PRESET_SYSTEM="Preset - System Dashboard" JLIB_MENUS_PRESET_USERS="Preset - Users Dashboard" diff --git a/administrator/modules/mod_menu/Menu/CssMenu.php b/administrator/modules/mod_menu/Menu/CssMenu.php index 4c380d5383b75..e16f1f1d52ffd 100644 --- a/administrator/modules/mod_menu/Menu/CssMenu.php +++ b/administrator/modules/mod_menu/Menu/CssMenu.php @@ -113,7 +113,7 @@ public function load($params, $enabled) if ($menutype === '*') { - $name = $this->params->get('preset', 'joomla'); + $name = $this->params->get('preset', 'default'); $this->root = MenusHelper::loadPreset($name); } else @@ -132,7 +132,7 @@ public function load($params, $enabled) $heading = new MenuItem(['title' => 'MOD_MENU_RECOVERY_MENU_ROOT', 'type' => 'heading']); $this->root->addChild($heading); - MenusHelper::loadPreset('joomla', true, $heading); + MenusHelper::loadPreset('default', true, $heading); $this->preprocess($this->root);