Changeset 2658 in subversion

Timestamp:

Jun 19, 2009 1:06:31 PM (4 years ago)

Author:

thomasb

Message:

Fix link text replacements (#1485789)

File:

• trunk/roundcubemail/program/include/rcube_string_replacer.php (modified) (2 diffs)

trunk/roundcubemail/program/include/rcube_string_replacer.php

@@ -75 +75 @@
     $scheme = strtolower($matches[1]);
 
-    if ($scheme == 'http://' || $scheme == 'https://' || $scheme == 'ftp://') {
+    if (preg_match('!^(http||ftp|file)s?://!', $scheme)) {
       $url = $matches[1] . $matches[2];
       $i = $this->add(html::a(array('href' => $url, 'target' => '_blank'), Q($url)));
@@ -84 +84 @@
     }
 
-    return $i >= 0 ? $this->get_replacement($i) : '';
+    // Return valid link for recognized schemes, otherwise, return the unmodified string for unrecognized schemes.
+    return $i >= 0 ? $this->get_replacement($i) : $matches[0];
   }