diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-09-17 12:59:56 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-09-17 12:59:56 +0200 |
| commit | b0ff9576848d9af59b45e410fb8a49dd1a4c17b6 (patch) | |
| tree | 214b13d1e2eac2e0209cc301a8d889d655edf01a /phpBB/includes/acp/acp_forums.php | |
| parent | aa95636a4d43449a1797956f5c5df727e877a6dc (diff) | |
| parent | 73b932763188ddff98f9271bbca31f66526278e2 (diff) | |
| download | forums-b0ff9576848d9af59b45e410fb8a49dd1a4c17b6.tar forums-b0ff9576848d9af59b45e410fb8a49dd1a4c17b6.tar.gz forums-b0ff9576848d9af59b45e410fb8a49dd1a4c17b6.tar.bz2 forums-b0ff9576848d9af59b45e410fb8a49dd1a4c17b6.tar.xz forums-b0ff9576848d9af59b45e410fb8a49dd1a4c17b6.zip | |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 3ea9d81887..66bb630241 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -843,9 +843,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']; @@ -889,7 +906,6 @@ class acp_forums 'U_SYNC' => $url . '&action=sync') ); } - while ($row = $db->sql_fetchrow($result)); } else if ($this->parent_id) { @@ -905,7 +921,7 @@ class acp_forums 'U_SYNC' => $url . '&action=sync') ); } - $db->sql_freeresult($result); + unset($rowset); $template->assign_vars(array( 'ERROR_MSG' => (sizeof($errors)) ? implode('<br />', $errors) : '', |