perdedora/leftypol
1
0
Fork 0
forked from leftypol/leftypol
Code Pull requests Activity

Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Browse source 
Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php
This commit is contained in:
czaks 2013-08-13 14:46:16 -04:00
commit 4f855cf3b3
6 changed files with 78 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
inc/mod/config-editor.php
View file

@ -115,8 +115,14 @@ function config_vars() {
$already_exists = true;
}
if (!$already_exists && permission_to_edit_config_var($var['name']))
if (!$already_exists && permission_to_edit_config_var($var['name'])) {
foreach ($var['comment'] as &$comment) {
$comment = preg_replace_callback(
'/((?:https?:\/\/|ftp:\/\/|irc:\/\/)[^\s<>()"]+?(?:\([^\s<>()"]*?\)[^\s<>()"]*?)*)((?:\s|<|>|"|\.||\]|!|\?|,|&#44;|&quot;)*(?:[\s<>()"]|$))/',
'markup_url', $comment);
}
$conf[] = $var;
}
}
}