diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-29 18:18:33 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-29 18:18:33 -0500 |
| commit | a811e65147db4d5c98914d201f2e4478f31f64fc (patch) | |
| tree | e5f1986d8aacef9ba9338d381b3803f1fcfe70d9 | |
| parent | ecf6f1eb8ca34da43b14b2da642cc7f1aa397d36 (diff) | |
| download | forums-a811e65147db4d5c98914d201f2e4478f31f64fc.tar forums-a811e65147db4d5c98914d201f2e4478f31f64fc.tar.gz forums-a811e65147db4d5c98914d201f2e4478f31f64fc.tar.bz2 forums-a811e65147db4d5c98914d201f2e4478f31f64fc.tar.xz forums-a811e65147db4d5c98914d201f2e4478f31f64fc.zip | |
[ticket/11103] Revert an overwrite that occured on merging from develop
PHPBB3-11103
| -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 02c31eb6cc..4df199d72d 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'], |