diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-13 12:20:09 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-13 12:20:09 +0100 |
| commit | 58678ff21c9fefd8eed11ad7cd0bbdb1254e49e7 (patch) | |
| tree | a80907ec671823d97d06f0a840ecf2765e0d940d | |
| parent | b0fe454163ab30e356551d7684b08dfd2a2fadb2 (diff) | |
| download | forums-58678ff21c9fefd8eed11ad7cd0bbdb1254e49e7.tar forums-58678ff21c9fefd8eed11ad7cd0bbdb1254e49e7.tar.gz forums-58678ff21c9fefd8eed11ad7cd0bbdb1254e49e7.tar.bz2 forums-58678ff21c9fefd8eed11ad7cd0bbdb1254e49e7.tar.xz forums-58678ff21c9fefd8eed11ad7cd0bbdb1254e49e7.zip | |
[ticket/14527] Retrieve link URL from href and not link text
PHPBB3-14527
| -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 be51a7342d..d984f41b08 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2745,7 +2745,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 39a3f0352f..cfa713daab 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -469,7 +469,7 @@ function decode_message(&$message, $bbcode_uid = '') $message = str_replace($match, $replace, $message); $match = get_preg_expression('bbcode_htm'); - $replace = array('\1', '\1', '\3', '\1', '', ''); + $replace = array('\1', '\1', '\2', '\1', '', ''); $message = preg_replace($match, $replace, $message); } |