From 66c3325e00b7a8c2439ed39c79f236c77b6bd12f Mon Sep 17 00:00:00 2001 From: thomasb Date: Fri, 19 Jun 2009 17:06:31 +0000 Subject: Fix link text replacements (#1485789) git-svn-id: https://svn.roundcube.net/trunk@2658 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_string_replacer.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'roundcubemail/program/include/rcube_string_replacer.php') diff --git a/roundcubemail/program/include/rcube_string_replacer.php b/roundcubemail/program/include/rcube_string_replacer.php index 064a723a2..8539ee55b 100644 --- a/roundcubemail/program/include/rcube_string_replacer.php +++ b/roundcubemail/program/include/rcube_string_replacer.php @@ -74,7 +74,7 @@ class rcube_string_replacer $i = -1; $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))); } @@ -83,7 +83,8 @@ class rcube_string_replacer $i = $this->add($m[1] . html::a(array('href' => 'http://' . $url, 'target' => '_blank'), Q($url))); } - 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]; } /** -- cgit v1.2.3