diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-24 13:04:26 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-10-24 13:04:26 +0000 |
| commit | 4e8e766ed654f96799153cce727a650907c66277 (patch) | |
| tree | ee6dd14ab75048a357e55d5c62a016a4b35a1f70 | |
| parent | 30f3ba83e3a29373139ce6147a9c37ec09ba7d61 (diff) | |
| download | forums-4e8e766ed654f96799153cce727a650907c66277.tar forums-4e8e766ed654f96799153cce727a650907c66277.tar.gz forums-4e8e766ed654f96799153cce727a650907c66277.tar.bz2 forums-4e8e766ed654f96799153cce727a650907c66277.tar.xz forums-4e8e766ed654f96799153cce727a650907c66277.zip | |
revert r9910 - ticket #1309
Reason for revert: http://www.phpbb.com/bugs/phpbb3/ticket.php?ticket_id=1309&start=8#post193395
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10229 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 1fe9e6234f..e6d0d0e601 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -234,7 +234,6 @@ <li>[Change] Cache get_username_string() function calls on viewtopic.</li> <li>[Change] Cache version check.</li> <li>[Change] When creating a new forum without copying permissions, ask again.</li> - <li>[Change] Parse multiline url title for [url] BBCode tag. (Bug #1309)</li> <li>[Change] Introduce new parameter to page_header() for forum specific who is online listings.</li> <li>[Change] Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.</li> <li>[Change] Unapproved topics can no longer be replied to. (Bug #44005, #47675, #23605)</li> diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 3df582d640..4961979d73 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(=(.*))?\]((?s).*)\[/url\]#iUe' => "\$this->validate_url('\$2', '\$3')")), + 'url' => array('bbcode_id' => 3, 'regexp' => array('#\[url(=(.*))?\](.*)\[/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')")), |