From e9d5c95afbb562c6e1e5677013906b220070295b Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 28 Jul 2015 05:29:38 -0400
Subject: [PATCH] - backported patches: - make sure umlautdomains can be found in lists. - sorting by database name did not work in database quota list. - IDN: use standard from 2008 (which also works with "ß").
---
interface/lib/classes/functions.inc.php | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/interface/lib/classes/functions.inc.php b/interface/lib/classes/functions.inc.php
index 43eec67..e5f0560 100644
--- a/interface/lib/classes/functions.inc.php
+++ b/interface/lib/classes/functions.inc.php
@@ -301,7 +301,7 @@
if($encode == true) {
if(function_exists('idn_to_ascii')) {
- $domain = idn_to_ascii($domain);
+ $domain = idn_to_ascii($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
/* use idna class:
* @author Matthias Sommerfeld <mso@phlylabs.de>
@@ -318,7 +318,7 @@
}
} else {
if(function_exists('idn_to_utf8')) {
- $domain = idn_to_utf8($domain);
+ $domain = idn_to_utf8($domain, IDNA_NONTRANSITIONAL_TO_ASCII, INTL_IDNA_VARIANT_UTS46);
} elseif(file_exists(ISPC_CLASS_PATH.'/idn/idna_convert.class.php')) {
/* use idna class:
* @author Matthias Sommerfeld <mso@phlylabs.de>
--
Gitblit v1.9.1