diff options
| author | 3Di <three3di@hotmail.it> | 2019-03-23 05:09:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-23 05:09:17 +0100 |
| commit | 6921565efe4674c51eb08326313cfca3349eedd5 (patch) | |
| tree | dabee12a9a81fe778be6769c5f1abc5be36ab9cf /phpBB/includes/functions_admin.php | |
| parent | 6c1664f6d3b85c1b4d620870444c8f4b82b08e57 (diff) | |
| parent | 0d04f53f374db12a1a285992a9c789a836848b3e (diff) | |
| download | forums-6921565efe4674c51eb08326313cfca3349eedd5.tar forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.gz forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.bz2 forums-6921565efe4674c51eb08326313cfca3349eedd5.tar.xz forums-6921565efe4674c51eb08326313cfca3349eedd5.zip | |
Merge branch '3.2.x' into ticket/15948
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 2fb83770fe..c19d48b0be 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -3042,6 +3042,8 @@ function tidy_database() } $db->sql_freeresult($result); + $db->sql_transaction('begin'); + // Delete those rows from the acl tables not having listed the forums above $sql = 'DELETE FROM ' . ACL_GROUPS_TABLE . ' WHERE ' . $db->sql_in_set('forum_id', $forum_ids, true); @@ -3051,6 +3053,8 @@ function tidy_database() WHERE ' . $db->sql_in_set('forum_id', $forum_ids, true); $db->sql_query($sql); + $db->sql_transaction('commit'); + $config->set('database_last_gc', time(), false); } |