Only pass hostname to Idna decode method

horde · Mar 3, 2015 · 375e027 · 375e027
1 parent 5a07bd4
commit 375e027
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/framework/Text_Filter/lib/Horde/Text/Filter/Linkurls.php b/framework/Text_Filter/lib/Horde/Text/Filter/Linkurls.php
@@ -149,7 +149,14 @@ public function callback($match)
         }
 
         try {
-            $decoded = Horde_Idna::decode($orig_href);
+            if (strlen($host = @parse_url($orig_href, PHP_URL_HOST))) {
+                $decoded = substr_replace(
+                    $orig_href,
+                    Horde_Idna::decode($host),
+                    strpos($orig_href, $host),
+                    strlen($host)
+                );
+            }
         } catch (Horde_Idna_Exception $e) {}
 
         $replacement = '<a href="' . $href . '"' .