diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-09-22 21:04:41 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-09-22 21:04:41 +0200 |
| commit | ae08036b2c29601723627e44b037f1b749b255e7 (patch) | |
| tree | 0ed0a096dfa3671a54fb569b2236108dc5023ffc /phpBB/includes | |
| parent | a028dfab1224cafcf705406aaf5229773591bf30 (diff) | |
| parent | 16941ff4958753a80db9aeb9b0b291916a561911 (diff) | |
| download | forums-ae08036b2c29601723627e44b037f1b749b255e7.tar forums-ae08036b2c29601723627e44b037f1b749b255e7.tar.gz forums-ae08036b2c29601723627e44b037f1b749b255e7.tar.bz2 forums-ae08036b2c29601723627e44b037f1b749b255e7.tar.xz forums-ae08036b2c29601723627e44b037f1b749b255e7.zip | |
Merge branch '3.2.x' into 3.3.x
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_display.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index ea007b8297..2d9aaba6e8 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -1119,7 +1119,6 @@ function display_custom_bbcodes() 'BBCODE_TAG' => $row['bbcode_tag'], 'BBCODE_TAG_CLEAN' => str_replace('=', '-', $row['bbcode_tag']), 'BBCODE_HELPLINE' => $row['bbcode_helpline'], - 'A_BBCODE_HELPLINE' => str_replace(array('&', '"', "'", '<', '>'), array('&', '"', "\'", '<', '>'), $row['bbcode_helpline']), ); /** |