Merge branch 'master' into feature-53938/StV_Tab_Noten_fertigstellen

application/models/system/Notiztyp_model.php

@@ -0,0 +1,14 @@
+<?php
+class Notiztyp_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'public.tbl_notiz_typ';
+		$this->pk = 'typ_kurzbz';
+	}
+}

application/models/system/Sprache_model.php

@@ -11,4 +11,19 @@ class Sprache_model extends DB_Model
 		$this->dbTable = 'public.tbl_sprache';
 		$this->pk = 'sprache';
 	}
+
+	/**
+	 * @param array		$sprachen
+	 * 
+	 * @return stdClass
+	 */
+	public function loadMultiple($sprachen)
+	{
+		$this->db->where_in('sprache', $sprachen);
+
+		$this->addOrder('index');
+
+		return $this->load();
+	}
+
 }

application/models/system/Variable_model.php

@@ -66,6 +66,15 @@ class Variable_model extends DB_Model
 					}
 				}
 			}
+
+			if (!isset($vardata['emailadressentrennzeichen']))
+			{
+				$vardata['emailadressentrennzeichen'] = 
+					(defined('DEFAULT_EMAILADRESSENTRENNZEICHEN'))
+					? DEFAULT_EMAILADRESSENTRENNZEICHEN
+					: ',';
+			}
+
 			$result = success($vardata);
 		}