diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-10 00:12:59 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-10 00:12:59 +0100 |
| commit | 6b328912ce3b60d8c7500c7bad6edcf4c8478e9a (patch) | |
| tree | be4c79cc03302cf8998c6351d9ea32beaef7ca9f /phpBB/includes/message_parser.php | |
| parent | a8259f7c8230e24ade214f1251960a5ad3adbf43 (diff) | |
| parent | 8ae1b0c52e21d105d1f35b5174081423b7c17bc4 (diff) | |
| download | forums-6b328912ce3b60d8c7500c7bad6edcf4c8478e9a.tar forums-6b328912ce3b60d8c7500c7bad6edcf4c8478e9a.tar.gz forums-6b328912ce3b60d8c7500c7bad6edcf4c8478e9a.tar.bz2 forums-6b328912ce3b60d8c7500c7bad6edcf4c8478e9a.tar.xz forums-6b328912ce3b60d8c7500c7bad6edcf4c8478e9a.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/includes/message_parser.php')
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 9a67473cf9..04a2726d22 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -313,7 +313,7 @@ class bbcode_firstpass extends bbcode $in = str_replace(' ', '%20', $in); // Checking urls - if (!preg_match('#^' . get_preg_expression('url') . '$#i', $in) && !preg_match('#^' . get_preg_expression('www_url') . '$#iu', $in)) + if (!preg_match('#^' . get_preg_expression('url') . '$#iu', $in) && !preg_match('#^' . get_preg_expression('www_url') . '$#iu', $in)) { return '[img]' . $in . '[/img]'; } |