summaryrefslogtreecommitdiff
path: root/program/lib
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-22 14:09:54 +0200
committerAleksander Machniak <alec@alec.pl>2013-04-22 14:16:49 +0200
commit17fb6ee98640b23175d20d4ceffb941c520bd3e8 (patch)
treebaa192e365188358e6d30a4f90c36acb8d8fe09e /program/lib
parenta2446d929654a4d1be113d6cab6b7fff4ae4e382 (diff)
Fix incorrect handling of some specific links (#1489060)
Conflicts: program/lib/Roundcube/rcube_string_replacer.php
Diffstat (limited to 'program/lib')
-rw-r--r--program/lib/Roundcube/rcube_string_replacer.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php
index 49a378166..02d5856cc 100644
--- a/program/lib/Roundcube/rcube_string_replacer.php
+++ b/program/lib/Roundcube/rcube_string_replacer.php
@@ -89,7 +89,7 @@ class rcube_string_replacer
if ($url) {
$suffix = $this->parse_url_brackets($url);
- $i = $this->add($prefix . html::a(array(
+ $i = $this->add(html::a(array(
'href' => $url_prefix . $url,
'target' => '_blank'
), rcube::Q($url)) . $suffix);
@@ -97,7 +97,7 @@ class rcube_string_replacer
// Return valid link for recognized schemes, otherwise
// return the unmodified string for unrecognized schemes.
- return $i >= 0 ? $this->get_replacement($i) : $matches[0];
+ return $i >= 0 ? $prefix . $this->get_replacement($i) : $matches[0];
}
/**