From 1b2cc47efd6b9decbb2ecd0a04ae022907b621eb Mon Sep 17 00:00:00 2001
From: oesi <oesi@technikum-wien.at>
Date: Fri, 24 Nov 2017 16:04:51 +0100
Subject: [PATCH] =?UTF-8?q?Inkonsistenz=20beim=20Trennzeichen=20f=C3=BCr?=
 =?UTF-8?q?=20EMailversand=20behoben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/functions.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/include/functions.inc.php b/include/functions.inc.php
index d63aa8f5f..cf6e2bad3 100644
--- a/include/functions.inc.php
+++ b/include/functions.inc.php
@@ -320,7 +320,10 @@ function loadVariables($user)
 	if (!isset($emailadressentrennzeichen))
 	{
 		global $emailadressentrennzeichen;
-		$emailadressentrennzeichen=',';
+		if(defined('DEFAULT_EMAILADRESSENTRENNZEICHEN'))
+			$emailadressentrennzeichen = DEFAULT_EMAILADRESSENTRENNZEICHEN;
+		else
+			$emailadressentrennzeichen=',';
 	}
 
 	if(!isset($alle_unr_mitladen))
@@ -1066,7 +1069,7 @@ function cutString($string, $limit, $placeholderSign = '', $keepFilextension = f
 	{
 		return '<span class="error">$placeholderSign must not be shorter than $limit</span>';
 	}
-	
+
 	if(strlen($string) > ($limit - $offset))
 	{
 		return substr($string, 0, ($limit - $offset)).$placeholderSign.$extension;