github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 22:33:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

URL RegExp Fix

Browse source 
Фикс распознавания ссылок содержащих одинарную ковычку
This commit is contained in:
Dark Nightmare 2015-05-04 09:06:29 +06:00 • committed by GTDarkNightmare
commit 8a708b1c0b
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/includes/bbcode.php
View file

@ -573,7 +573,7 @@ class bbcode
$text = preg_replace_callback('#(\[(quote|spoiler)=")(.+?)("\])#', array(&$this, 'escape_tiltes_callback'), $text); $text = preg_replace_callback('#(\[(quote|spoiler)=")(.+?)("\])#', array(&$this, 'escape_tiltes_callback'), $text);
// [url] // [url]
$url_exp = '[\w\#!$%&~/.\-;:=,?@а-яА-Я()\[\]+]+?'; $url_exp = "[\w\#!$%&~/.\-;':=,?@а-яА-Я()\[\]+]+?";
$text = preg_replace_callback("#\[url\]((?:https?://)?$url_exp)\[/url\]#isu", array(&$this, 'url_callback'), $text); $text = preg_replace_callback("#\[url\]((?:https?://)?$url_exp)\[/url\]#isu", array(&$this, 'url_callback'), $text);
$text = preg_replace_callback("#\[url\](www\.$url_exp)\[/url\]#isu", array(&$this, 'url_callback'), $text); $text = preg_replace_callback("#\[url\](www\.$url_exp)\[/url\]#isu", array(&$this, 'url_callback'), $text);
$text = preg_replace_callback("#\[url=((?:https?://)?$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text); $text = preg_replace_callback("#\[url=((?:https?://)?$url_exp)\]([^?\n\t].*?)\[/url\]#isu", array(&$this, 'url_callback'), $text);
@ -737,7 +737,7 @@ class bbcode
(?<![\"'=]) (?<![\"'=])
\b \b
( (
https?://[\w\#!$%&~/.\-;:=?@а-яА-Я()\[\]+]+ https?://[\w\#!$%&~/.\-;':=?@а-яА-Я()\[\]+]+
) )
(?![\"']|\[/url|\[/img|</a) (?![\"']|\[/url|\[/img|</a)
(?=[,!]?\s|[\)<!]) (?=[,!]?\s|[\)<!])