[Phpbb-checkins] r9910 - in /branches/phpBB-3_0_0/phpBB: docs/CHANGELOG.html includes/message_parser.php

[Ruslan U. <rx...@ph...>]

Author: rxu
Date: Sat Aug  1 17:28:02 2009
New Revision: 9910

Log:
Fix bug #1309 - Multiline [url] not Converted
Authorised by: AcydBurn

Modified:
    branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
    branches/phpBB-3_0_0/phpBB/includes/message_parser.php

Modified: branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html
==============================================================================
*** branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html (original)
--- branches/phpBB-3_0_0/phpBB/docs/CHANGELOG.html Sat Aug  1 17:28:02 2009
***************
*** 209,214 ****
--- 209,215 ----
  		<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>[Feature] Add language selection on the registration terms page (Bug #15085 - Patch by leviatan21)</li>
  		<li>[Feature] Backported 3.2 captcha plugins.
  			<ul>

Modified: branches/phpBB-3_0_0/phpBB/includes/message_parser.php
==============================================================================
*** branches/phpBB-3_0_0/phpBB/includes/message_parser.php (original)
--- branches/phpBB-3_0_0/phpBB/includes/message_parser.php Sat Aug  1 17:28:02 2009
***************
*** 115,121 ****
  			'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')")),
  			'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')")),
--- 115,121 ----
  			'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')")),
  			'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')")),