- Bugfix: fixed method generateFilterMenu of FiltersLib to generate the correct link for menu entries

- Bugfix: system/Filters_model is loaded in every methods of FiltersLib and FilterWidget where it is used

application/libraries/FiltersLib.php

@@ -313,6 +313,8 @@ class FiltersLib
 
 		if ($datasetQuery != null)
 		{
+			$this->_ci->load->model('system/Filters_model', 'FiltersModel');
+
 			// Execute the given SQL statement suppressing error messages
 			$dataset = @$this->_ci->FiltersModel->execReadOnlyQuery($datasetQuery);
 		}
@@ -715,7 +717,7 @@ class FiltersLib
 						$filter->description[0], // description
 						sprintf(
 							'%s?%s=%s',
-							site_url($this->_ci->router->directory.$this->_ci->router->class.'/'.$this->_ci->router->method),
+							site_url($navigationPage),
 							self::FILTER_ID,
 							$filter->filter_id
 						) // link
@@ -816,6 +818,8 @@ class FiltersLib
 	{
 		$condition = ''; // starts building the condition
 
+		$this->_ci->load->model('system/Filters_model', 'FiltersModel');
+
 		// "operation" is a required property for the applied filter definition
 		if (!isEmptyString($filterDefinition->operation))
 		{