diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2012-11-30 23:11:44 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2012-11-30 23:11:44 +0100 |
| commit | 081440f6c4bd6b7c2838dd0587ed6a4dffc87d52 (patch) | |
| tree | 72c9d739430466e5ac1e81db930a89d503ff5772 /phpBB/includes/acp | |
| parent | 33b98dc5ba0b690fdae72acfd676dae5a897cb6a (diff) | |
| download | forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.tar forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.tar.gz forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.tar.bz2 forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.tar.xz forums-081440f6c4bd6b7c2838dd0587ed6a4dffc87d52.zip | |
[feature/avatars] Create setting for enabling avatar in manager
PHPBB3-10018
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 0467cc7c35..bb90918a46 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -111,10 +111,17 @@ class acp_board $avatar_drivers = $phpbb_avatar_manager->get_valid_drivers(true); $avatar_vars = array(); - foreach ($avatar_drivers as $driver) + foreach ($avatar_drivers as $current_driver) { - $avatar = $phpbb_avatar_manager->get_driver($driver); - $avatar_vars += $avatar->prepare_form_acp(); + $driver = $phpbb_avatar_manager->get_driver($current_driver); + + /* + * First grab the settings for enabling/disabling the avatar + * driver and afterwards grab additional settings the driver + * might have. + */ + $avatar_vars += $phpbb_avatar_manager->get_avatar_settings($driver); + $avatar_vars += $driver->prepare_form_acp(); } $display_vars = array( |