makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/php-events] Make handling of forumrow consistent with others

Browse source 
PHPBB3-9550
This commit is contained in:
Joas Schilling 2012-06-20 16:43:08 +02:00
parent b1582ece91
commit bdfedba521
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpBB/includes/functions_display.php
View file

@ -452,7 +452,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
} }
} }
$template->assign_block_vars('forumrow', array( $forum_row = array(
'S_IS_CAT' => false, 'S_IS_CAT' => false,
'S_NO_CAT' => $catless && !$last_catless, 'S_NO_CAT' => $catless && !$last_catless,
'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false, 'S_IS_LINK' => ($row['forum_type'] == FORUM_LINK) ? true : false,
@ -489,12 +489,14 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod
'U_UNAPPROVED_TOPICS' => ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_topics&f=' . $row['forum_id_unapproved_topics']) : '', 'U_UNAPPROVED_TOPICS' => ($row['forum_id_unapproved_topics']) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&mode=unapproved_topics&f=' . $row['forum_id_unapproved_topics']) : '',
'U_VIEWFORUM' => $u_viewforum, 'U_VIEWFORUM' => $u_viewforum,
'U_LAST_POSTER' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']), 'U_LAST_POSTER' => get_username_string('profile', $row['forum_last_poster_id'], $row['forum_last_poster_name'], $row['forum_last_poster_colour']),
'U_LAST_POST' => $last_post_url) 'U_LAST_POST' => $last_post_url,
); );
$vars = array('row'); $vars = array('row', 'forum_row');
extract($phpbb_dispatcher->trigger_event('core.display_forums_assign_block_vars', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.display_forums_assign_block_vars', compact($vars)));
$template->assign_block_vars('forumrow', $forum_row);
// Assign subforums loop for style authors // Assign subforums loop for style authors
foreach ($subforums_list as $subforum) foreach ($subforums_list as $subforum)
{ {