diff options
| author | rxu <rxu@mail.ru> | 2014-11-25 22:20:14 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2015-07-07 22:30:20 +0700 |
| commit | 1365519283d5574ea0668f25052f4fee960d27f4 (patch) | |
| tree | 14c9dbe6b30c42cedb58bf01dbc8b20067d4f382 /phpBB | |
| parent | f81a2bc7c56cfcb57feaed293be87bbe640dfa5f (diff) | |
| download | forums-1365519283d5574ea0668f25052f4fee960d27f4.tar forums-1365519283d5574ea0668f25052f4fee960d27f4.tar.gz forums-1365519283d5574ea0668f25052f4fee960d27f4.tar.bz2 forums-1365519283d5574ea0668f25052f4fee960d27f4.tar.xz forums-1365519283d5574ea0668f25052f4fee960d27f4.zip | |
[ticket/13377] Fix decoding for www type URLs in function decode_message()
PHPBB3-13377
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_content.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index bb4fc5dbae..d6ed40bdf8 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2749,7 +2749,7 @@ function get_preg_expression($mode) return array( '#<!\-\- e \-\-><a href="mailto:(.*?)">.*?</a><!\-\- e \-\->#', '#<!\-\- l \-\-><a (?:class="[\w-]+" )?href="(.*?)(?:(&|\?)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', '#<.*?>#s', diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 5cebc54eb2..fd39c61b14 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -420,7 +420,7 @@ function decode_message(&$message, $bbcode_uid = '') $message = str_replace($match, $replace, $message); $match = get_preg_expression('bbcode_htm'); - $replace = array('\1', '\1', '\2', '\1', '', ''); + $replace = array('\1', '\1', '\3', '\1', '', ''); $message = preg_replace($match, $replace, $message); } |