aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_forums.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-09-17 12:58:18 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-09-17 12:58:18 +0200
commit73b932763188ddff98f9271bbca31f66526278e2 (patch)
tree3397c0ae35101a54c8edd249115100f699870ed8 /phpBB/includes/acp/acp_forums.php
parentbd59241110261a7878f700941e0a42ab74e423c6 (diff)
parent3bf64de247f23f701e92d17ccb7c055fb019623d (diff)
downloadforums-73b932763188ddff98f9271bbca31f66526278e2.tar
forums-73b932763188ddff98f9271bbca31f66526278e2.tar.gz
forums-73b932763188ddff98f9271bbca31f66526278e2.tar.bz2
forums-73b932763188ddff98f9271bbca31f66526278e2.tar.xz
forums-73b932763188ddff98f9271bbca31f66526278e2.zip
Merge pull request #4403 from rxu/ticket/14738
[ticket/14738] Add core events to improve modifying forum lists
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
-rw-r--r--phpBB/includes/acp/acp_forums.php24
1 files changed, 20 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 98273f06d9..1e69a4ad20 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -842,9 +842,26 @@ class acp_forums
ORDER BY left_id";
$result = $db->sql_query($sql);
- if ($row = $db->sql_fetchrow($result))
+ $rowset = array();
+ while ($row = $db->sql_fetchrow($result))
+ {
+ $rowset[(int) $row['forum_id']] = $row;
+ }
+ $db->sql_freeresult($result);
+
+ /**
+ * Modify the forum list data
+ *
+ * @event core.acp_manage_forums_modify_forum_list
+ * @var array rowset Array with the forums list data
+ * @since 3.1.10-RC1
+ */
+ $vars = array('rowset');
+ extract($phpbb_dispatcher->trigger_event('core.acp_manage_forums_modify_forum_list', compact($vars)));
+
+ if (!empty($rowset))
{
- do
+ foreach ($rowset as $row)
{
$forum_type = $row['forum_type'];
@@ -888,7 +905,6 @@ class acp_forums
'U_SYNC' => $url . '&amp;action=sync')
);
}
- while ($row = $db->sql_fetchrow($result));
}
else if ($this->parent_id)
{
@@ -904,7 +920,7 @@ class acp_forums
'U_SYNC' => $url . '&amp;action=sync')
);
}
- $db->sql_freeresult($result);
+ unset($rowset);
$template->assign_vars(array(
'ERROR_MSG' => (sizeof($errors)) ? implode('<br />', $errors) : '',