Infra-Mirrors/PrivateBin
1
0
Fork 0
mirror of https://github.com/PrivateBin/PrivateBin.git synced 2025-07-24 07:20:45 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into webcrypto

Browse source
This commit is contained in:
El RIDO 2018-08-14 06:59:47 +02:00
commit bd6888687f
No known key found for this signature in database
GPG key ID: 0F5C940A6BD81F92
36 changed files with 54 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/privatebin.js
View file

@ -6,7 +6,7 @@
* @see {@link https://github.com/PrivateBin/PrivateBin}
* @copyright 2012 Sébastien SAUVAGE ({@link http://sebsauvage.net})
* @license {@link https://www.opensource.org/licenses/zlib-license.php The zlib/libpng License}
* @version 1.2
* @version 1.2.1
* @name PrivateBin
* @namespace
*/
@ -142,7 +142,7 @@ jQuery.PrivateBin = (function($, sjcl, RawDeflate) {
me.urls2links = function(html)
{
return html.replace(
/(((http|https|ftp):\/\/[\w?=&.\/-;#@~%+*-]+(?![\w\s?&.\/;#~%"=-]*>))|((magnet):[\w?=&.\/-;#@~%+*-]+))/ig,
/(((https?|ftp):\/\/[\w?!=&.\/-;#@~%+*-]+(?![\w\s?!&.\/;#~%"=-]*>))|((magnet):[\w?=&.\/-;#@~%+*-]+))/ig,
'<a href="$1" rel="nofollow">$1</a>'
);
};