Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #976 from ArthurHoaro/hotfix/url-parentheses

Browse source 
Fix parsing for description links with parentheses
This commit is contained in:
ArthurHoaro 2017-09-30 14:25:53 +02:00 committed by GitHub
commit 3512f44617
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/LinkUtils.php
View file

@ -109,7 +109,7 @@ function count_private($links)
*/ */
function text2clickable($text, $redirector = '') function text2clickable($text, $redirector = '')
{ {
$regex = '!(((?:https?|ftp|file)://|apt:|magnet:)\S+[[:alnum:]]/?)!si'; $regex = '!(((?:https?|ftp|file)://|apt:|magnet:)\S+[a-z0-9\(\)]/?)!si';
if (empty($redirector)) { if (empty($redirector)) {
return preg_replace($regex, '<a href="$1">$1</a>', $text); return preg_replace($regex, '<a href="$1">$1</a>', $text);

10
tests/LinkUtilsTest.php
View file

@ -103,6 +103,16 @@ public function testText2clickableWithoutRedirector()
$expectedText = 'stuff <a href="http://hello.there/is=someone#here">http://hello.there/is=someone#here</a> otherstuff'; $expectedText = 'stuff <a href="http://hello.there/is=someone#here">http://hello.there/is=someone#here</a> otherstuff';
$processedText = text2clickable($text, ''); $processedText = text2clickable($text, '');
$this->assertEquals($expectedText, $processedText); $this->assertEquals($expectedText, $processedText);
$text = 'stuff http://hello.there/is=someone#here(please) otherstuff';
$expectedText = 'stuff <a href="http://hello.there/is=someone#here(please)">http://hello.there/is=someone#here(please)</a> otherstuff';
$processedText = text2clickable($text, '');
$this->assertEquals($expectedText, $processedText);
$text = 'stuff http://hello.there/is=someone#here(please)&no otherstuff';
$expectedText = 'stuff <a href="http://hello.there/is=someone#here(please)&no">http://hello.there/is=someone#here(please)&no</a> otherstuff';
$processedText = text2clickable($text, '');
$this->assertEquals($expectedText, $processedText);
} }
/** /**