diff options
| author | David King <imkingdavid@gmail.com> | 2013-09-06 12:53:34 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-09-06 12:53:34 -0700 |
| commit | bbcd3967efeb270dca27a63e99b2aeb89631790d (patch) | |
| tree | d376a7a0bdf67149e81d9446904e3dbf360b8246 /phpBB | |
| parent | 2ccc992da16cf4feaefef3deb230b1b7cae2cac3 (diff) | |
| download | forums-bbcd3967efeb270dca27a63e99b2aeb89631790d.tar forums-bbcd3967efeb270dca27a63e99b2aeb89631790d.tar.gz forums-bbcd3967efeb270dca27a63e99b2aeb89631790d.tar.bz2 forums-bbcd3967efeb270dca27a63e99b2aeb89631790d.tar.xz forums-bbcd3967efeb270dca27a63e99b2aeb89631790d.zip | |
[ticket/11824] Fix smilies
PHPBB3-11824
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_content.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 05d3c5fde2..104f7b97de 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -813,7 +813,7 @@ function bbcode_nl2br($text) */ function smiley_text($text, $force_option = false) { - global $config, $user, $phpbb_root_path; + global $config, $user, $symfony_request, $phpbb_root_path; if ($force_option || !$config['allow_smilies'] || !$user->optionget('viewsmilies')) { @@ -821,7 +821,7 @@ function smiley_text($text, $force_option = false) } else { - $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path; + $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : phpbb_get_web_root_path($symfony_request, $phpbb_root_path); return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2 />', $text); } } |