Merge branch 'danielsFeatures' into 'master'

Daniels features

See merge request !7

registration-system/admin/pages_admin.php

@@ -324,7 +324,7 @@ class AdminAdminPage extends AdminPage {
 		$this->getMessage() .
 		$this->getUserFileEditSection() .
 		$this->getNeueFahrtSection() .
-		$this->getCurrentFahrtSelectorSection() .'<br>'.
+		$this->getCurrentFahrtSelectorSection() .'<br>';
 	//	$this->getArchiveSelectorSection() .'<br>';
 	}
 

registration-system/frameworks/Fahrt.php

@@ -53,7 +53,8 @@ class Fahrt {
 
     public static function getAlleFahrten() {
         $tmpEnvironment = Environment::getEnv();
-        $fahrtenData = $tmpEnvironment->database->select('fahrten', Fahrt::$ALLOWED_FIELDS, 'ORDER BY fahrt_id DESC');
+    //    $fahrtenData = $tmpEnvironment->database->select('fahrten', Fahrt::$ALLOWED_FIELDS, 'ORDER BY fahrt_id DESC');
+        $fahrtenData = $tmpEnvironment->database->select('fahrten', Fahrt::$ALLOWED_FIELDS, ["ORDER" => ["fahrt_id" => "DESC"]]);
 
         if (empty($fahrtenData))
             return null;