aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/message_parser.php
diff options
context:
space:
mode:
authorRuslan Uzdenov <rxu@mail.ru>2009-08-01 16:28:02 +0000
committerRuslan Uzdenov <rxu@mail.ru>2009-08-01 16:28:02 +0000
commitd78703d73bd40a9d0d553cfb6d39bf5347f84927 (patch)
treef1562652583fa9dfd7b6b236f5600af12d620aff /phpBB/includes/message_parser.php
parentb7a0ef7e7a5f758cfaf874c84f8fc32c098946ab (diff)
downloadforums-d78703d73bd40a9d0d553cfb6d39bf5347f84927.tar
forums-d78703d73bd40a9d0d553cfb6d39bf5347f84927.tar.gz
forums-d78703d73bd40a9d0d553cfb6d39bf5347f84927.tar.bz2
forums-d78703d73bd40a9d0d553cfb6d39bf5347f84927.tar.xz
forums-d78703d73bd40a9d0d553cfb6d39bf5347f84927.zip
Fix bug #1309 - Multiline [url] not Converted
Authorised by: AcydBurn git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9910 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/message_parser.php')
-rw-r--r--phpBB/includes/message_parser.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 2d7dfb6004..6e626eeee8 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -115,7 +115,7 @@ class bbcode_firstpass extends bbcode
'attachment' => array('bbcode_id' => 12, 'regexp' => array('#\[attachment=([0-9]+)\](.*?)\[/attachment\]#ise' => "\$this->bbcode_attachment('\$1', '\$2')")),
'b' => array('bbcode_id' => 1, 'regexp' => array('#\[b\](.*?)\[/b\]#ise' => "\$this->bbcode_strong('\$1')")),
'i' => array('bbcode_id' => 2, 'regexp' => array('#\[i\](.*?)\[/i\]#ise' => "\$this->bbcode_italic('\$1')")),
- 'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](.*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
+ 'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\]((?s).*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")),
'img' => array('bbcode_id' => 4, 'regexp' => array('#\[img\](.*)\[/img\]#iUe' => "\$this->bbcode_img('\$1')")),
'size' => array('bbcode_id' => 5, 'regexp' => array('#\[size=([\-\+]?\d+)\](.*?)\[/size\]#ise' => "\$this->bbcode_size('\$1', '\$2')")),
'color' => array('bbcode_id' => 6, 'regexp' => array('!\[color=(#[0-9a-f]{3}|#[0-9a-f]{6}|[a-z\-]+)\](.*?)\[/color\]!ise' => "\$this->bbcode_color('\$1', '\$2')")),