friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge pull request #6904 from MrPetovan/bug/6901-autolinker-fix-punctuation-domain 

Exclude punctuation from domain in autolinker regular expression
This commit is contained in:
Tobias Diekershoff 2019-03-18 06:07:11 +01:00 committed by GitHub
parent 634edc183b 58a9a319c5
commit d32105aa8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Util/Strings.php
View File

@ -361,7 +361,10 @@ class Strings
( # Capture 1: entire matched URL ( # Capture 1: entire matched URL
https?:// # http or https protocol https?:// # http or https protocol
(?: (?:
[^/\s.][^/\s]+[.][^\s/]+/? # looks like domain name followed by a slash [^/\s`!()\[\]{};:\'",<>?«»“”‘’.] # Domain can\'t start with a .
[^/\s`!()\[\]{};:\'",<>?«»“”‘’]+ # Domain can\'t end with a .
\.
[^/\s`!()\[\]{};:\'".,<>?«»“”‘’]+/? # Followed by a slash
) )
(?: # One or more: (?: # One or more:
[^\s()<>]+ # Run of non-space, non-()<> [^\s()<>]+ # Run of non-space, non-()<>

4
tests/src/Content/Text/BBCodeTest.php
View File

@ -102,6 +102,10 @@ class BBCodeTest extends MockedTest
'data' => "http://example.com\ntest", 'data' => "http://example.com\ntest",
'assertHTML' => false 'assertHTML' => false
], ],
'bug-6901' => [
'data' => "http://example.com<ul>",
'assertHTML' => false
],
]; ];
} }