diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-16 20:31:03 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-16 20:31:03 -0400 |
| commit | ad2feb917f5b26e36f28e3599c8f07bed268eb9e (patch) | |
| tree | 56917446dddd4f3254eb310cdebdb163f7e5cc47 /phpBB/includes | |
| parent | 60acba81d1b8ea9416ef265c290e8892a44b7f77 (diff) | |
| parent | bef3f9c7e7d4373993eb8d3d76df78685b4e043f (diff) | |
| download | forums-ad2feb917f5b26e36f28e3599c8f07bed268eb9e.tar forums-ad2feb917f5b26e36f28e3599c8f07bed268eb9e.tar.gz forums-ad2feb917f5b26e36f28e3599c8f07bed268eb9e.tar.bz2 forums-ad2feb917f5b26e36f28e3599c8f07bed268eb9e.tar.xz forums-ad2feb917f5b26e36f28e3599c8f07bed268eb9e.zip | |
Merge PR #917 branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10967] adding $root_path to posting_get_topic_icons
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index c50395a5df..20550cf7a0 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -296,13 +296,15 @@ function posting_gen_topic_icons($mode, $icon_id) if (sizeof($icons)) { + $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path; + foreach ($icons as $id => $data) { if ($data['display']) { $template->assign_block_vars('topic_icon', array( 'ICON_ID' => $id, - 'ICON_IMG' => $phpbb_root_path . $config['icons_path'] . '/' . $data['img'], + 'ICON_IMG' => $root_path . $config['icons_path'] . '/' . $data['img'], 'ICON_WIDTH' => $data['width'], 'ICON_HEIGHT' => $data['height'], |