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

[ticket/13377] Fix decoding for www type URLs in function decode_message()

Browse source 
PHPBB3-13377
This commit is contained in:
rxu 2014-11-25 22:20:14 +07:00
parent f81a2bc7c5
commit 1365519283
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/functions.php
View file

@ -2749,7 +2749,7 @@ function get_preg_expression($mode)
return array( return array(
'#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#', '#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#',
'#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&amp;|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#', '#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&amp;|\?)sid=[0-9a-f]{32})?">.*?</a><!\-\- l \-\->#',
'#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">.*?</a><!\-\- \1 \-\->#', '#<!\-\- ([mw]) \-\-><a (?:class="[\w-]+" )?href="(.*?)">(.*?)</a><!\-\- \1 \-\->#',
'#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#', '#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/.*? \/><!\-\- s\1 \-\->#',
'#<!\-\- .*? \-\->#s', '#<!\-\- .*? \-\->#s',
'#<.*?>#s', '#<.*?>#s',

2
phpBB/includes/functions_content.php
View file

@ -420,7 +420,7 @@ function decode_message(&$message, $bbcode_uid = '')
$message = str_replace($match, $replace, $message); $message = str_replace($match, $replace, $message);
$match = get_preg_expression('bbcode_htm'); $match = get_preg_expression('bbcode_htm');
$replace = array('\1', '\1', '\2', '\1', '', ''); $replace = array('\1', '\1', '\3', '\1', '', '');
$message = preg_replace($match, $replace, $message); $message = preg_replace($match, $replace, $message);
} }