aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorSenky <jakubsenko@gmail.com>2012-07-23 14:28:47 +0200
committerSenky <jakubsenko@gmail.com>2012-10-11 20:38:24 +0200
commitd434672dde1592f51013459357c25ed49887d12f (patch)
treeffffed5f97c16efe1b875e2cecaeb431df999760 /phpBB/includes
parent80180a6a20077aff293b3d3dd0ce8b0065c33f3b (diff)
downloadforums-d434672dde1592f51013459357c25ed49887d12f.tar
forums-d434672dde1592f51013459357c25ed49887d12f.tar.gz
forums-d434672dde1592f51013459357c25ed49887d12f.tar.bz2
forums-d434672dde1592f51013459357c25ed49887d12f.tar.xz
forums-d434672dde1592f51013459357c25ed49887d12f.zip
[ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_posting.php6
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&amptopic_id=2&ampp=3#p3
*/
function phpbb_bump_topic($forum_id, $topic_id, $post_data, $bump_time = false)