diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 17:20:29 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-09 17:20:29 +0200 |
| commit | 0c5af536f1de55b6ee30ab9f193b6ea7637ac5b1 (patch) | |
| tree | 24d4de806927f543a56da3caa18a31d104c79ae9 /phpBB/includes | |
| parent | 41a5c3bf2b94d48a654edc7986116a845cb81970 (diff) | |
| parent | 1ee39d8c93615ccb59a6d3e4624889f6ae92c5c4 (diff) | |
| download | forums-0c5af536f1de55b6ee30ab9f193b6ea7637ac5b1.tar forums-0c5af536f1de55b6ee30ab9f193b6ea7637ac5b1.tar.gz forums-0c5af536f1de55b6ee30ab9f193b6ea7637ac5b1.tar.bz2 forums-0c5af536f1de55b6ee30ab9f193b6ea7637ac5b1.tar.xz forums-0c5af536f1de55b6ee30ab9f193b6ea7637ac5b1.zip | |
Merge pull request #2553 from rxu/ticket/12668
[ticket/12668] Add subforums_row to core.display_forums_modify_template_vars event
* rxu/ticket/12668:
[ticket/12668] Add subforums_row to core.display_forums_modify_template_vars
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_display.php | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php index d9b8d8fd62..22b8a8825e 100644 --- a/phpBB/includes/functions_display.php +++ b/phpBB/includes/functions_display.php @@ -497,10 +497,15 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod $l_post_click_count = ($row['forum_type'] == FORUM_LINK) ? 'CLICKS' : 'POSTS'; $post_click_count = ($row['forum_type'] != FORUM_LINK || $row['forum_flags'] & FORUM_FLAG_LINK_TRACK) ? $row['forum_posts'] : ''; - $s_subforums_list = array(); + $s_subforums_list = $subforums_row = array(); foreach ($subforums_list as $subforum) { $s_subforums_list[] = '<a href="' . $subforum['link'] . '" class="subforum ' . (($subforum['unread']) ? 'unread' : 'read') . '" title="' . (($subforum['unread']) ? $user->lang['UNREAD_POSTS'] : $user->lang['NO_UNREAD_POSTS']) . '">' . $subforum['name'] . '</a>'; + $subforums_row[] = array( + 'U_SUBFORUM' => $subforum['link'], + 'SUBFORUM_NAME' => $subforum['name'], + 'S_UNREAD' => $subforum['unread'], + ); } $s_subforums_list = (string) implode($user->lang['COMMA_SEPARATOR'], $s_subforums_list); $catless = ($row['parent_id'] == $root_data['forum_id']) ? true : false; @@ -572,22 +577,17 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod * @event core.display_forums_modify_template_vars * @var array forum_row Template data of the forum * @var array row The data of the forum + * @var array subforums_row Template data of subforums * @since 3.1.0-a1 + * @change 3.1.0-b5 Added var subforums_row */ - $vars = array('forum_row', 'row'); + $vars = array('forum_row', 'row', 'subforums_row'); extract($phpbb_dispatcher->trigger_event('core.display_forums_modify_template_vars', compact($vars))); $template->assign_block_vars('forumrow', $forum_row); // Assign subforums loop for style authors - foreach ($subforums_list as $subforum) - { - $template->assign_block_vars('forumrow.subforum', array( - 'U_SUBFORUM' => $subforum['link'], - 'SUBFORUM_NAME' => $subforum['name'], - 'S_UNREAD' => $subforum['unread']) - ); - } + $template->assign_block_vars_array('forumrow.subforum', $subforums_row); /** * Modify and/or assign additional template data for the forum @@ -600,6 +600,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod * @var array forum_row Template data of the forum * @var array row The data of the forum * @var array subforums_list The data of subforums + * @var array subforums_row Template data of subforums * @var bool catless The flag indicating whether a forum has a parent category * @since 3.1.0-b5 */ @@ -607,6 +608,7 @@ function display_forums($root_data = '', $display_moderators = true, $return_mod 'forum_row', 'row', 'subforums_list', + 'subforums_row', 'catless', ); extract($phpbb_dispatcher->trigger_event('core.display_forums_add_template_data', compact($vars))); |