diff --git a/administrator/components/com_menus/models/forms/item.xml b/administrator/components/com_menus/models/forms/item.xml index 456723682a3be..66dd1bc4a5844 100644 --- a/administrator/components/com_menus/models/forms/item.xml +++ b/administrator/components/com_menus/models/forms/item.xml @@ -70,7 +70,7 @@ description="COM_MENUS_ITEM_FIELD_TYPE_DESC" class="input-medium" required="true" - size="40" + size="40" /> diff --git a/administrator/components/com_menus/models/forms/item_alias.xml b/administrator/components/com_menus/models/forms/item_alias.xml index 3b09c6fc343bc..72d65a362b2e7 100644 --- a/administrator/components/com_menus/models/forms/item_alias.xml +++ b/administrator/components/com_menus/models/forms/item_alias.xml @@ -5,8 +5,8 @@
- + + + + +
- - - - - diff --git a/administrator/components/com_menus/views/item/tmpl/edit.php b/administrator/components/com_menus/views/item/tmpl/edit.php index 604de3a312f73..2f9933150335f 100644 --- a/administrator/components/com_menus/views/item/tmpl/edit.php +++ b/administrator/components/com_menus/views/item/tmpl/edit.php @@ -151,7 +151,7 @@ if ($this->item->type == 'alias') { - echo $this->form->renderFieldset('aliasoptions'); + echo $this->form->renderField('aliasoptions', 'params'); } if ($this->item->type == 'separator') @@ -169,6 +169,11 @@ echo $this->form->renderField('link'); + if ($this->item->type == 'alias') + { + echo $this->form->renderField('alias_redirect', 'params'); + } + echo $this->form->renderField('browserNav'); echo $this->form->renderField('template_style_id'); diff --git a/administrator/language/en-GB/en-GB.com_menus.ini b/administrator/language/en-GB/en-GB.com_menus.ini index 58f6b7d095fc9..2b596176b8e99 100644 --- a/administrator/language/en-GB/en-GB.com_menus.ini +++ b/administrator/language/en-GB/en-GB.com_menus.ini @@ -94,6 +94,8 @@ COM_MENUS_ITEM_DETAILS="Details" COM_MENUS_ITEM_FIELD_ALIAS_DESC="The alias is used in the URL when SEF is on." COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC="Menu Item to link to." COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL="Menu Item" +COM_MENUS_ITEM_FIELD_ALIAS_REDIRECT_DESC="If set to Yes then visitors will be redirected to the linked menu item." +COM_MENUS_ITEM_FIELD_ALIAS_REDIRECT_LABEL="Use Redirection" COM_MENUS_ITEM_FIELD_ANCHOR_CSS_DESC="An optional class to apply to the menu hyperlink." COM_MENUS_ITEM_FIELD_ANCHOR_CSS_LABEL="Link Class" COM_MENUS_ITEM_FIELD_ANCHOR_TITLE_DESC="An optional, custom description for the title attribute of the menu hyperlink." diff --git a/libraries/src/Application/CMSApplication.php b/libraries/src/Application/CMSApplication.php index a4e5e957aa2c3..b541700dd2203 100644 --- a/libraries/src/Application/CMSApplication.php +++ b/libraries/src/Application/CMSApplication.php @@ -1075,7 +1075,10 @@ protected function route() $active = $this->getMenu()->getActive(); - if ($active !== null && $active->type === 'alias') + if ($active !== null + && $active->type === 'alias' + && $active->params->get('alias_redirect') + && in_array($this->input->getMethod(), array('GET', 'HEAD'), true)) { $item = $this->getMenu()->getItem($active->params->get('aliasoptions'));