diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 09:56:00 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-09-13 09:56:00 -0500 |
| commit | f8e665751a0926807c8352eb2b2d942247d3c029 (patch) | |
| tree | 147012141dfdd899a98430e8ba6f8b8e59fae21d /phpBB/includes/functions_content.php | |
| parent | 8b2653dae361506c46ffcdf8db90734421a3cbc7 (diff) | |
| download | forums-f8e665751a0926807c8352eb2b2d942247d3c029.tar forums-f8e665751a0926807c8352eb2b2d942247d3c029.tar.gz forums-f8e665751a0926807c8352eb2b2d942247d3c029.tar.bz2 forums-f8e665751a0926807c8352eb2b2d942247d3c029.tar.xz forums-f8e665751a0926807c8352eb2b2d942247d3c029.zip | |
[ticket/11832] Fix smiley paths
PHPBB3-11832
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -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..5fa37f60bd 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, $phpbb_filesystem; 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_filesystem->get_web_root_path(); return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img class="smilies" src="' . $root_path . $config['smilies_path'] . '/\2 />', $text); } } |