1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 01:20:40 +01:00

Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2018-01-16 21:34:23 +01:00
commit ab65accebc
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995

View File

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