mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10189 from nextcloud/backport/10020/email-address-misparsed-in-comments-and-chat 

[stable13] Fix "parsing" of email-addresses in comments and chat messages
This commit is contained in:
Morris Jobke 2018-07-11 11:41:32 +02:00 committed by GitHub
parent a9b4be205a 4e99dc2318
commit cc09db6c5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/js/public/comments.js
View File

@ -21,7 +21,7 @@
* The downside: anything not ascii is excluded. Not sure how common it is in areas using different * The downside: anything not ascii is excluded. Not sure how common it is in areas using different
* alphabets… the upside: fake domains with similar looking characters won't be formatted as links * alphabets… the upside: fake domains with similar looking characters won't be formatted as links
*/ */
urlRegex: /(\b(https?:\/\/|([-A-Z0-9+_])*\.([-A-Z])+)[-A-Z0-9+&@#\/%?=~_|!:,.;()]*[-A-Z0-9+&@#\/%=~_|()])/ig, urlRegex: /((\s|^)(https?:\/\/|([-A-Z0-9+_])*\.([-A-Z])+)[-A-Z0-9+&@#\/%?=~_|!:,.;()]*[-A-Z0-9+&@#\/%=~_|()])/ig,
protocolRegex: /^https:\/\//, protocolRegex: /^https:\/\//,
plainToRich: function(content) { plainToRich: function(content) {
@ -39,7 +39,7 @@
return content.replace(this.urlRegex, function(url) { return content.replace(this.urlRegex, function(url) {
var hasProtocol = (url.indexOf('https://') !== -1) || (url.indexOf('http://') !== -1); var hasProtocol = (url.indexOf('https://') !== -1) || (url.indexOf('http://') !== -1);
if(!hasProtocol) { if(!hasProtocol) {
url = 'https://' + url; url = 'https://' + url.trim();
} }
var linkText = url.replace(self.protocolRegex, ''); var linkText = url.replace(self.protocolRegex, '');