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 '$placeholderSign must not be shorter than $limit'; } - + if(strlen($string) > ($limit - $offset)) { return substr($string, 0, ($limit - $offset)).$placeholderSign.$extension;