diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-06 19:40:25 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-10 17:13:02 +0200 |
| commit | 9210d735a53e3c4a4de042b49dae361c436268e1 (patch) | |
| tree | 793dcb2db51b153b7777e5852a7d945482f75b81 /phpBB/includes/acp | |
| parent | 6206d4aa4ea08df513154d8b87d35785f69a9f2a (diff) | |
| download | forums-9210d735a53e3c4a4de042b49dae361c436268e1.tar forums-9210d735a53e3c4a4de042b49dae361c436268e1.tar.gz forums-9210d735a53e3c4a4de042b49dae361c436268e1.tar.bz2 forums-9210d735a53e3c4a4de042b49dae361c436268e1.tar.xz forums-9210d735a53e3c4a4de042b49dae361c436268e1.zip | |
[ticket/8319] Do not repeat the replacement
PHPBB3-8319
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index ead716b300..31166a56dc 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -431,15 +431,11 @@ class acp_bbcodes $fp_replace = str_replace($token, $replace, $fp_replace); $sp_match = str_replace(preg_quote($token, '!'), $sp_tokens[$token_type], $sp_match); - if ($token_type === 'LOCAL_URL') - { - // Prepend the board url to local relative links - $sp_replace = str_replace($token, generate_board_url() . '/' . '${' . ($n + 1) . '}', $sp_replace); - } - else - { - $sp_replace = str_replace($token, '${' . ($n + 1) . '}', $sp_replace); - } + + // Prepend the board url to local relative links + $replace_prepend = ($token_type === 'LOCAL_URL') ? generate_board_url() . '/' : ''; + + $sp_replace = str_replace($token, $replace_prepend . '${' . ($n + 1) . '}', $sp_replace); } $fp_match = '!' . $fp_match . '!' . $modifiers; |