diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-15 01:19:55 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-12-15 16:50:28 -0500 |
| commit | 5c496674f63b31e892d0f3bed7921feb947ed839 (patch) | |
| tree | c0313b6e6cc99d24ce4ad440f124d226231cef90 /phpBB/includes/functions_user.php | |
| parent | b6778802b3784da34db4890eabd6c64100a385fc (diff) | |
| download | forums-5c496674f63b31e892d0f3bed7921feb947ed839.tar forums-5c496674f63b31e892d0f3bed7921feb947ed839.tar.gz forums-5c496674f63b31e892d0f3bed7921feb947ed839.tar.bz2 forums-5c496674f63b31e892d0f3bed7921feb947ed839.tar.xz forums-5c496674f63b31e892d0f3bed7921feb947ed839.zip | |
[ticket/10758] Dependency inject parameters into cache_moderators.
Also add phpbb prefix since the signature is being changed anyway.
PHPBB3-10758
Diffstat (limited to 'phpBB/includes/functions_user.php')
| -rw-r--r-- | phpBB/includes/functions_user.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 8f9c9198f4..2d6c15a5b1 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -2842,7 +2842,7 @@ function avatar_remove_db($avatar_name) */ function group_delete($group_id, $group_name = false) { - global $db, $phpbb_root_path, $phpEx, $phpbb_dispatcher; + global $db, $cache, $auth, $phpbb_root_path, $phpEx, $phpbb_dispatcher; if (!$group_name) { @@ -2913,12 +2913,12 @@ function group_delete($group_id, $group_name = false) extract($phpbb_dispatcher->trigger_event('core.delete_group_after', compact($vars))); // Re-cache moderators - if (!function_exists('cache_moderators')) + if (!function_exists('phpbb_cache_moderators')) { include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); } - cache_moderators(); + phpbb_cache_moderators($db, $cache, $auth); add_log('admin', 'LOG_GROUP_DELETE', $group_name); @@ -3678,7 +3678,7 @@ function group_memberships($group_id_ary = false, $user_id_ary = false, $return_ */ function group_update_listings($group_id) { - global $auth; + global $db, $cache, $auth; $hold_ary = $auth->acl_group_raw_data($group_id, array('a_', 'm_')); @@ -3720,12 +3720,12 @@ function group_update_listings($group_id) if ($mod_permissions) { - if (!function_exists('cache_moderators')) + if (!function_exists('phpbb_cache_moderators')) { global $phpbb_root_path, $phpEx; include($phpbb_root_path . 'includes/functions_admin.' . $phpEx); } - cache_moderators(); + phpbb_cache_moderators($db, $cache, $auth); } if ($mod_permissions || $admin_permissions) |