Merge branch '4.0-dev' into fix#23850

joomla · Feb 19, 2019 · fb7f377 · fb7f377
2 parents 4011ee0 + f034154
commit fb7f377
Show file tree

Hide file tree

Showing 36 changed files with 1,077 additions and 2,103 deletions.
diff --git a/administrator/components/com_categories/forms/category.xml b/administrator/components/com_categories/forms/category.xml
@@ -204,7 +204,6 @@
 		name="tags"
 		type="tag"
 		label="JTAG"
-		class="col-sm-12"
 		multiple="true"
 	/>
 

diff --git a/administrator/components/com_fields/forms/field.xml b/administrator/components/com_fields/forms/field.xml
@@ -266,10 +266,9 @@
 
 			<field
 				name="display_readonly"
-				type="radio"
+				type="list"
 				label="JFIELD_DISPLAY_READONLY_LABEL"
 				description="JFIELD_DISPLAY_READONLY_DESC"
-				class="btn-group btn-group-yesno"
 				default="2"
 				>
 				<option value="2">JGLOBAL_INHERIT</option>

diff --git a/administrator/components/com_menus/Controller/MenuController.php b/administrator/components/com_menus/Controller/MenuController.php
@@ -76,7 +76,7 @@ public function save($key = null, $urlVar = null)
 
 		// Get the model and attempt to validate the posted data.
 		/* @var \Joomla\Component\Menus\Administrator\Model\MenuModel $model */
-		$model = $this->getModel('Menu');
+		$model = $this->getModel('Menu', '', ['ignore_request' => false]);
 		$form  = $model->getForm();
 
 		if (!$form)

diff --git a/administrator/components/com_menus/Field/MenuPresetField.php b/administrator/components/com_menus/Field/MenuPresetField.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Form\Field\ListField;
 use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
-use Joomla\CMS\Menu\MenuHelper;
+use Joomla\Component\Menus\Administrator\Helper\MenusHelper;
 
 /**
  * Administrator Menu Presets list field.
@@ -42,7 +42,7 @@ class MenuPresetField extends ListField
 	protected function getOptions()
 	{
 		$options = array();
-		$presets = MenuHelper::getPresets();
+		$presets = MenusHelper::getPresets();
 
 		foreach ($presets as $preset)
 		{