When there is no filter form the admin list view should not crash

joomla · Aug 7, 2020 · 583fd4c · 583fd4c
1 parent bc0da36
commit 583fd4c
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/libraries/src/MVC/Model/ListModel.php b/libraries/src/MVC/Model/ListModel.php
@@ -349,8 +349,6 @@ public function getStart()
 	 */
 	public function getFilterForm($data = array(), $loadData = true)
 	{
-		$form = null;
-
 		// Try to locate the filter form automatically. Example: ContentModelArticles => "filter_articles"
 		if (empty($this->filterFormName))
 		{
@@ -362,13 +360,21 @@ public function getFilterForm($data = array(), $loadData = true)
 			}
 		}
 
-		if (!empty($this->filterFormName))
+		if (empty($this->filterFormName))
+		{
+			return null;
+		}
+
+		try
 		{
 			// Get the form.
-			$form = $this->loadForm($this->context . '.filter', $this->filterFormName, array('control' => '', 'load_data' => $loadData));
+			return $this->loadForm($this->context . '.filter', $this->filterFormName, array('control' => '', 'load_data' => $loadData));
+		}
+		catch (\RuntimeException $e)
+		{
 		}
 
-		return $form;
+		return null;
 	}
 
 	/**