diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-12-25 15:18:47 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-12-25 15:18:47 +0100 |
| commit | cb7f6deb07ba2869c62a80584d81feb3d3baf682 (patch) | |
| tree | f30e45ace777ecc2a1b1db2ec2ab8449bc7486ac /phpBB/install | |
| parent | 21b9ac6c880cbee7c8bda263871b24414671672a (diff) | |
| parent | 8707a3413504b0cf922086daa6fc497ccf090448 (diff) | |
| download | forums-cb7f6deb07ba2869c62a80584d81feb3d3baf682.tar forums-cb7f6deb07ba2869c62a80584d81feb3d3baf682.tar.gz forums-cb7f6deb07ba2869c62a80584d81feb3d3baf682.tar.bz2 forums-cb7f6deb07ba2869c62a80584d81feb3d3baf682.tar.xz forums-cb7f6deb07ba2869c62a80584d81feb3d3baf682.zip | |
Merge remote-tracking branch 'p/ticket/10758' into develop
* p/ticket/10758:
[ticket/10758] Add return to the other compat function.
[ticket/10758] Add periods.
[ticket/10758] Yes, only one empty line.
[ticket/10758] Add deprecated tags.
[ticket/10758] Add compat functions.
[ticket/10758] Admin is not working yet.
[ticket/10758] Test moderator and admin permissions.
[ticket/10758] Check that acl was changed in the test.
[ticket/10758] Extract obtain_user_data for the benefit of tests.
[ticket/10758] Functional test for changing a user's permission.
[ticket/10758] Spelling fix.
[ticket/10758] Add a test for acp login.
[ticket/10758] Dependency inject parameters into update_foes.
[ticket/10758] Dependency inject parameters into cache_moderators.
Diffstat (limited to 'phpBB/install')
| -rw-r--r-- | phpBB/install/install_convert.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/install/install_convert.php b/phpBB/install/install_convert.php index 9afe341ffa..15202768b8 100644 --- a/phpBB/install/install_convert.php +++ b/phpBB/install/install_convert.php @@ -1538,6 +1538,7 @@ class install_convert extends module function finish_conversion() { global $db, $phpbb_root_path, $phpEx, $convert, $config, $language, $user, $template; + global $cache, $auth; $db->sql_query('DELETE FROM ' . CONFIG_TABLE . " WHERE config_name = 'convert_progress' @@ -1547,7 +1548,7 @@ class install_convert extends module $db->sql_query('DELETE FROM ' . SESSIONS_TABLE); @unlink($phpbb_root_path . 'cache/data_global.' . $phpEx); - cache_moderators(); + phpbb_cache_moderators($db, $cache, $auth); // And finally, add a note to the log add_log('admin', 'LOG_INSTALL_CONVERTED', $convert->convertor_data['forum_name'], $config['version']); |