makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

#12473

Browse source 
git-svn-id: file:///svn/phpbb/trunk@7774 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-06-18 12:16:12 +00:00
parent eaed6d806e
commit 2599387b28
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -281,6 +281,7 @@ p a {
<li>[Fix] Simulate Firebird's affected rows mechanism for older versions of PHP</li> <li>[Fix] Simulate Firebird's affected rows mechanism for older versions of PHP</li>
<li>[Fix] Custom BBCodes properly handle lowercasing of parameterized tags (Bug #12377)</li> <li>[Fix] Custom BBCodes properly handle lowercasing of parameterized tags (Bug #12377)</li>
<li>[Fix] Update the forum_id sequence for PostgreSQL during conversion (Bug #11927)</li> <li>[Fix] Update the forum_id sequence for PostgreSQL during conversion (Bug #11927)</li>
<li>[Fix] Allow for multiple tags containing URL and LOCAL_URL tokens (Bug #12473)</li>
</ul> </ul>

4
phpBB/includes/acp/acp_bbcodes.php
View file

@ -295,10 +295,10 @@ class acp_bbcodes
// @todo Make sure to change this too if something changed in message parsing // @todo Make sure to change this too if something changed in message parsing
$tokens = array( $tokens = array(
'URL' => array( 'URL' => array(
'!([a-z0-9]+://)?([^< "\r\n\t\]]*)!ie' => "(('\$1') ? '\$1\$2' : 'http://\$2')" '!([a-z0-9]+://)?([^< "\r\n\t\]]*?)!ie' => "(('\$1') ? '\$1\$2' : 'http://\$2')"
), ),
'LOCAL_URL' => array( 'LOCAL_URL' => array(
'!([^:]+/[^< "\r\n\t\]]*)!' => '$1' '!([^:]+/[^< "\r\n\t\]]*?)!' => '$1'
), ),
'EMAIL' => array( 'EMAIL' => array(
'!([a-z0-9]+[a-z0-9\-\._]*@(?:(?:[0-9]{1,3}\.){3,5}[0-9]{1,3}|[a-z0-9]+[a-z0-9\-\._]*\.[a-z]+))!i' => '$1' '!([a-z0-9]+[a-z0-9\-\._]*@(?:(?:[0-9]{1,3}\.){3,5}[0-9]{1,3}|[a-z0-9]+[a-z0-9\-\._]*\.[a-z]+))!i' => '$1'