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

Conflicts:
	inc/config.php
	inc/display.php
	inc/functions.php

1 files changed, 7 insertions, 1 deletions

diff --git a/inc/mod/config-editor.php b/inc/mod/config-editor.php
index 27740378..3f15ebe5 100644
--- a/inc/mod/config-editor.php
+++ b/inc/mod/config-editor.php
@@ -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;
+					}
 				}
 			}