Fix preinstall model and form path in installer

joomla · May 13, 2018 · 5fa9178 · 5fa9178
1 parent 3a13f8f
commit 5fa9178
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/installation/src/Model/ChecksModel.php b/installation/src/Model/ChecksModel.php
@@ -251,7 +251,7 @@ public function getForm($view = null)
 		}
 
 		// Get the form.
-		Form::addFormPath(JPATH_COMPONENT . '/model/forms');
+		Form::addFormPath(JPATH_COMPONENT . '/forms');
 
 		try
 		{

diff --git a/installation/src/Model/LanguagesModel.php b/installation/src/Model/LanguagesModel.php
@@ -520,7 +520,7 @@ public function getForm($view = null)
 		}
 
 		// Get the form.
-		Form::addFormPath(JPATH_COMPONENT . '/model/forms');
+		Form::addFormPath(JPATH_COMPONENT . '/forms');
 		Form::addFieldPath(JPATH_COMPONENT . '/model/fields');
 		Form::addRulePath(JPATH_COMPONENT . '/model/rules');
 

diff --git a/installation/src/View/Preinstall/HtmlView.php b/installation/src/View/Preinstall/HtmlView.php
@@ -28,6 +28,14 @@ class HtmlView extends DefaultView
 	 */
 	protected $options;
 
+	/**
+	 * The default model
+	 *
+	 * @var	   string
+	 * @since  3.0
+	 */
+	protected $_defaultModel = 'checks';
+
 	/**
 	 * Execute and display a template script.
 	 *
@@ -39,7 +47,7 @@ class HtmlView extends DefaultView
 	 */
 	public function display($tpl = null)
 	{
-		$this->options  = $this->get('PhpOptions', 'Checks');
+		$this->options = $this->get('PhpOptions');
 
 		return parent::display($tpl);
 	}