Merge branch 'master' into feature-25999/C4_ma0594dev

application/controllers/components/Antrag/Leitung.php

@@ -101,7 +101,10 @@ class Leitung extends FHC_Controller
 				$this->output->set_status_header(500);
 				return $this->outputJson('Internal Server Error');
 			}
-			$antraege = getData($result);
+			if(hasData($result))
+			{
+			    $antraege = getData($result);
+			}
 		}
 
 		$this->outputJson($antraege);

application/controllers/components/Antrag/Unterbrechung.php

@@ -27,7 +27,8 @@ class Unterbrechung extends FHC_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'studierendenantrag'
+			'studierendenantrag',
+			'ui'
 		]);
 	}
 
@@ -85,7 +86,7 @@ class Unterbrechung extends FHC_Controller
 
 		$data = getData($result);
 
-		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiengang_kz, $data->studiensemester_kurzbz, $data->semester);
+		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiensemester_kurzbz);
 
 		$this->outputJsonSuccess($data);
 	}

application/controllers/components/Antrag/Wiederholung.php

@@ -41,6 +41,7 @@ class Wiederholung extends FHC_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
+			'global',
 			'studierendenantrag'
 		]);
 	}

application/controllers/components/Filter.php

@@ -26,6 +26,9 @@ class Filter extends FHC_Controller
 		// Loads authentication library and starts authentication
 		$this->load->library('AuthLib');
 
+		// Loads the FiltersModel
+		$this->load->model('system/Filters_model', 'FiltersModel');
+
 		// Loads the FilterCmptLib with HTTP GET/POST parameters
 		$this->_startFilterCmptLib();
 	}