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

Merge branch 'master' into develop

Browse source 
Conflicts:
	upload/config.php
This commit is contained in:
Exile 2014-09-07 17:18:53 +04:00
commit 16c1e401d7
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
upload/includes/bbcode.php
View file

@ -704,7 +704,7 @@ class bbcode
$url = trim($m[1]);
$url_name = (isset($m[2])) ? trim($m[2]) : $url;
if (!preg_match("#^http://#", $url) && !preg_match("/^#/", $url)) $url = 'http://' . $url;
if (!preg_match("#^https?://#isu", $url) && !preg_match("/^#/", $url)) $url = 'http://' . $url;
if (in_array(parse_url($url, PHP_URL_HOST), $bb_cfg['nofollow']['allowed_url']) || $bb_cfg['nofollow']['disabled'])
{

2
upload/language/uk/main.php
View file

@ -1389,8 +1389,8 @@ $lang['STATUS'] = 'Статус';
$lang['LAST_CHANGED_BY'] = 'Остання зміна';
$lang['CHANGES'] = 'Змінити';
$lang['ACTION'] = 'Дія';
$lang['COMMENT'] = 'Коментар';
$lang['REASON'] = 'Причина';
$lang['COMMENT'] = 'Коментар';
// search
$lang['SEARCH_S'] = 'пошук...';