aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2015-07-13 17:36:35 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2015-07-13 17:36:35 +0200
commit58d1d37c167c978257c9a4680d56835c63202738 (patch)
treeed204d000f0fe2b492c0f6b876809bf147165af0 /phpBB/includes/functions.php
parentd54f9d176e1a36806cbbb69a134a5b5d62b6fb39 (diff)
parentd63412af4c177a97997ddd65c91ee6ced7760bc9 (diff)
downloadforums-58d1d37c167c978257c9a4680d56835c63202738.tar
forums-58d1d37c167c978257c9a4680d56835c63202738.tar.gz
forums-58d1d37c167c978257c9a4680d56835c63202738.tar.bz2
forums-58d1d37c167c978257c9a4680d56835c63202738.tar.xz
forums-58d1d37c167c978257c9a4680d56835c63202738.zip
Merge pull request #3747 from rxu/ticket/13377
[ticket/13377] Fix decoding for www type URLs in function decode_message()
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 49fd732bb8..d109fe0648 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="(.*?)(?:(&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',
'#<.*?>#s',