aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Cullum <unknownbliss@phpbbdevelopers.net>2012-03-16 00:02:35 +0000
committerJoas Schilling <nickvergessen@gmx.de>2012-08-01 10:18:38 +0200
commit6c50f6610f66b865e6fa6ee82235c3ff373fdfd3 (patch)
tree21ec04d07580daf6d6cff14deaf2deb558b1a8d3
parent57c417157761cea7e4c0cdece0bdf9068f25dbbe (diff)
downloadforums-6c50f6610f66b865e6fa6ee82235c3ff373fdfd3.tar
forums-6c50f6610f66b865e6fa6ee82235c3ff373fdfd3.tar.gz
forums-6c50f6610f66b865e6fa6ee82235c3ff373fdfd3.tar.bz2
forums-6c50f6610f66b865e6fa6ee82235c3ff373fdfd3.tar.xz
forums-6c50f6610f66b865e6fa6ee82235c3ff373fdfd3.zip
[feature/events] Fix core.viewforum_topicrow ledge
PHPBB3-9550
-rw-r--r--phpBB/viewforum.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 2d5b7e0758..dac4230ce0 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -690,7 +690,7 @@ if (sizeof($topic_list))
$u_mcp_queue = ($topic_unapproved || $posts_unapproved) ? append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=queue&amp;mode=' . (($topic_unapproved) ? 'approve_details' : 'unapproved_posts') . "&amp;t=$topic_id", true, $user->session_id) : '';
// Send vars to template
- $forumrow = array(
+ $topicrow = array(
'FORUM_ID' => $row['forum_id'],
'TOPIC_ID' => $topic_id,
'TOPIC_AUTHOR' => get_username_string('username', $row['topic_poster'], $row['topic_first_poster_name'], $row['topic_first_poster_colour']),
@@ -742,15 +742,15 @@ if (sizeof($topic_list))
'U_MCP_REPORT' => append_sid("{$phpbb_root_path}mcp.$phpEx", 'i=reports&amp;mode=reports&amp;f=' . $row['forum_id'] . '&amp;t=' . $topic_id, true, $user->session_id),
'U_MCP_QUEUE' => $u_mcp_queue,
- 'S_TOPIC_TYPE_SWITCH' => ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test
+ 'S_TOPIC_TYPE_SWITCH' => ($s_type_switch == $s_type_switch_test) ? -1 : $s_type_switch_test,
);
- $vars = array('forumrow');
+ $vars = array('topicrow');
$event = new phpbb_event_data(compact($vars));
- $phpbb_dispatcher->dispatch('core.viewforum_forumrow', $event);
+ $phpbb_dispatcher->dispatch('core.viewforum_topicrow', $event);
extract($event->get_data_filtered($vars));
- $template->assign_block_vars('topicrow', $forumrow);
+ $template->assign_block_vars('topicrow', $topicrow);
phpbb_generate_template_pagination($template, $view_topic_url, 'topicrow.pagination', 'start', $replies + 1, $config['posts_per_page'], 1, true, true);