[mms[ Make Net_IDNA2 the highest priority backend driver.

True/Punycode does not handle multiple i18n domains in a single hostname
horde · Feb 26, 2015 · c75527c · c75527c
1 parent a256891
commit c75527c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/framework/Idna/lib/Horde/Idna.php b/framework/Idna/lib/Horde/Idna.php
@@ -61,16 +61,16 @@ public static function decode($data)
     protected static function _getBackend()
     {
         if (!isset(self::$_backend)) {
-            if (extension_loaded('mbstring')) {
+            if (class_exists('Net_IDNA2')) {
+                self::$_backend = new Net_IDNA2();
+            } elseif (extension_loaded('mbstring')) {
                 if (file_exists(__DIR__ . '/Idna/vendor/autoload.php')) {
                     require_once __DIR__ . '/Idna/vendor/autoload.php';
                 } else {
                     require_once __DIR__ . '/../../bundle/vendor/autoload.php';
                 }
                 self::$_backend = new True\Punycode();
                 mb_internal_encoding('UTF-8');
-            } elseif (class_exists('Net_IDNA2')) {
-                self::$_backend = new Net_IDNA2();
             } elseif (class_exists('Net_IDNA')) {
                 self::$_backend = new Net_IDNA();
             } else {

diff --git a/framework/Idna/package.xml b/framework/Idna/package.xml
@@ -21,7 +21,7 @@
  </stability>
  <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
  <notes>
-* 
+* [mms[ Make Net_IDNA2 the highest priority backend driver.
  </notes>
  <contents>
   <dir baseinstalldir="/" name="/">
@@ -168,7 +168,7 @@
    <date>2015-01-07</date>
    <license uri="http://www.horde.org/licenses/bsd">BSD-2-Clause</license>
    <notes>
-* 
+* [mms[ Make Net_IDNA2 the highest priority backend driver.
    </notes>
   </release>
  </changelog>