diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-16 20:30:45 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-10-16 20:30:45 -0400 |
| commit | bef3f9c7e7d4373993eb8d3d76df78685b4e043f (patch) | |
| tree | 205778c11987ca0fdb30658615d7709553977c67 /phpBB | |
| parent | 0348950ff140746e3463511328702fc8a5952efe (diff) | |
| parent | d434672dde1592f51013459357c25ed49887d12f (diff) | |
| download | forums-bef3f9c7e7d4373993eb8d3d76df78685b4e043f.tar forums-bef3f9c7e7d4373993eb8d3d76df78685b4e043f.tar.gz forums-bef3f9c7e7d4373993eb8d3d76df78685b4e043f.tar.bz2 forums-bef3f9c7e7d4373993eb8d3d76df78685b4e043f.tar.xz forums-bef3f9c7e7d4373993eb8d3d76df78685b4e043f.zip | |
Merge PR #917 branch 'Senky/ticket/10967' into develop-olympus
* Senky/ticket/10967:
[ticket/10967] adding $root_path to posting_get_topic_icons
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 68b6199cf5..aa15593a19 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -288,13 +288,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'], @@ -2637,7 +2639,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u * - 'topic_last_post_subject' * - 'topic_last_poster_name' * - 'topic_last_poster_colour' -* @param int $bump_time The time at which topic was bumped, usually it is a current time as obtained via time(). +* @param int $bump_time The time at which topic was bumped, usually it is a current time as obtained via time(). * @return string An URL to the bumped topic, example: ./viewtopic.php?forum_id=1&topic_id=2&p=3#p3 */ function phpbb_bump_topic($forum_id, $topic_id, $post_data, $bump_time = false) |