Fixed URL matching

This commit is contained in:
Savetheinternet 2011-01-02 22:17:25 +11:00
parent 6bbe658370
commit bcda984255

View File

@ -212,7 +212,7 @@
// Whether to turn URLs into functional links // Whether to turn URLs into functional links
define('MARKUP_URLS', true, true); define('MARKUP_URLS', true, true);
// Complex regular expression to catch URLs // Complex regular expression to catch URLs
define('URL_REGEX', '/' . '(https?|ftp):\/\/' . '(([\w\-]+\.)+[a-zA-Z]{2,6}|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' . '(\/([\w\-~\.#\/?=&;:+%]+))?' . '/', true); define('URL_REGEX', '/' . '(https?|ftp):\/\/' . '(([\w\-]+\.)+[a-zA-Z]{2,6}|\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})' . '(\/([\w\-~\.#\/?=&;:+%]+)?)?' . '/', true);
// Allowed file extensions // Allowed file extensions
$allowed_ext = Array('jpg', 'jpeg', 'bmp', 'gif', 'png', true); $allowed_ext = Array('jpg', 'jpeg', 'bmp', 'gif', 'png', true);