summaryrefslogtreecommitdiff
path: root/inc/config.php
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-08-05 06:17:01 -0400
committerczaks <marcin@6irc.net>2013-08-05 06:17:01 -0400
commit2cc0769f54767b4fb1a480eff0df4d373219e06d (patch)
tree80c00f94e0dc8c540fd8a8ccf6010f2e31f24dab /inc/config.php
parent0d8e2a65ab6ab719bc5dec5d7ddcab45342d882c (diff)
Revert "Merge branch 'master' of github.com:vichan-devel/Tinyboard"
This reverts commit a84c4510fccfdc0cfb6f187633daea10dc70f326, reversing changes made to a8327c3a37fd22d2aa5d63061c9d3eaa30ae425a.
Diffstat (limited to 'inc/config.php')
-rw-r--r--inc/config.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/inc/config.php b/inc/config.php
index 54b60bf3..cddbf074 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1327,3 +1327,4 @@
// Complex regular expression to catch URLs.
$config['url_regex'] = '/' . '(https?|ftp):\/\/' . '(([\w\-]+\.)+[a-zA-Z]{2,6}|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' . '(:\d+)?' . '(\/([\w\-~.#\/?=&;:+%!*\[\]@$\'()+,|\^]+)?)?' . '/';
+