mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 06:20:46 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander
2018-01-16 21:34:23 +01:00
parent 6ac85a371a 1cd8bbac0c
commit ab65accebc
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/acp/acp_forums.php
View File

@@ -1431,6 +1431,8 @@ class acp_forums
return $errors; return $errors;
} }
$db->sql_transaction('begin');
$moved_forums = get_forum_branch($from_id, 'children', 'descending'); $moved_forums = get_forum_branch($from_id, 'children', 'descending');
$from_data = $moved_forums[0]; $from_data = $moved_forums[0];
$diff = count($moved_forums) * 2; $diff = count($moved_forums) * 2;
@@ -1502,6 +1504,8 @@ class acp_forums
WHERE " . $db->sql_in_set('forum_id', $moved_ids); WHERE " . $db->sql_in_set('forum_id', $moved_ids);
$db->sql_query($sql); $db->sql_query($sql);
$db->sql_transaction('commit');
return $errors; return $errors;
} }