diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-04-22 14:09:54 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-04-22 14:09:54 +0200 |
| commit | 70229cbbfc2d6e1a8c013aebd00ad9a593fcc350 (patch) | |
| tree | 4061ef116ab2d7e7476de97e603534e100d255e9 | |
| parent | 1041aa46da9fe177d33aae1f1bf4fc1a1eb79529 (diff) | |
Fix incorrect handling of some specific links (#1489060)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_string_replacer.php | 4 | ||||
| -rw-r--r-- | tests/Framework/StringReplacer.php | 2 |
3 files changed, 5 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix incorrect handling of some specific links (#1489060) - Fix incorrect handling of leading spaces in text wrapping - Fix unintentional messages list jumps on click in Internet Explorer (#1489056) - Fix list of required configuration options (#1489055) diff --git a/program/lib/Roundcube/rcube_string_replacer.php b/program/lib/Roundcube/rcube_string_replacer.php index b8768bc98..0fc90a55a 100644 --- a/program/lib/Roundcube/rcube_string_replacer.php +++ b/program/lib/Roundcube/rcube_string_replacer.php @@ -95,12 +95,12 @@ class rcube_string_replacer $attrib = (array)$this->options['link_attribs']; $attrib['href'] = $url_prefix . $url; - $i = $this->add($prefix . html::a($attrib, rcube::Q($url)) . $suffix); + $i = $this->add(html::a($attrib, rcube::Q($url)) . $suffix); } // 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]; } /** diff --git a/tests/Framework/StringReplacer.php b/tests/Framework/StringReplacer.php index 95c59221b..dc7638734 100644 --- a/tests/Framework/StringReplacer.php +++ b/tests/Framework/StringReplacer.php @@ -37,6 +37,8 @@ class Framework_StringReplacer extends PHPUnit_Framework_TestCase array('http://link.com?(link)', '<a href="http://link.com?(link)">http://link.com?(link)</a>'), array('http://<test>', 'http://<test>'), array('http://', 'http://'), + array('1@1.com www.domain.tld', '<a href="mailto:1@1.com">1@1.com</a> <a href="http://www.domain.tld">www.domain.tld</a>'), + array(' www.domain.tld ', ' <a href="http://www.domain.tld">www.domain.tld</a> '), ); } |