diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-03-27 09:59:25 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-03-27 09:59:25 +0200 |
| commit | 1600d82b772f419aca8b35d9d404440fecc7a483 (patch) | |
| tree | 7c17ce1fc66bafec9b82d788f2d81b2a654248ce /phpBB/includes/ucp/ucp_profile.php | |
| parent | 4db229ff6c6c260e4fdb26449b391f3858c9479a (diff) | |
| parent | b39b3da5af89d9687ff5e985244695131d36c753 (diff) | |
| download | forums-1600d82b772f419aca8b35d9d404440fecc7a483.tar forums-1600d82b772f419aca8b35d9d404440fecc7a483.tar.gz forums-1600d82b772f419aca8b35d9d404440fecc7a483.tar.bz2 forums-1600d82b772f419aca8b35d9d404440fecc7a483.tar.xz forums-1600d82b772f419aca8b35d9d404440fecc7a483.zip | |
Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x
Conflicts:
phpBB/adm/style/acp_icons.html
phpBB/includes/acp/acp_groups.php
phpBB/includes/acp/acp_users.php
phpBB/includes/functions_acp.php
phpBB/includes/ucp/ucp_groups.php
phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
phpBB/styles/subsilver2/template/mcp_topic.html
phpBB/styles/subsilver2/template/posting_attach_body.html
phpBB/styles/subsilver2/template/posting_body.html
phpBB/styles/subsilver2/template/posting_poll_body.html
phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
Diffstat (limited to 'phpBB/includes/ucp/ucp_profile.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_profile.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_profile.php b/phpBB/includes/ucp/ucp_profile.php index 5c0b792f6f..c65bb83eae 100644 --- a/phpBB/includes/ucp/ucp_profile.php +++ b/phpBB/includes/ucp/ucp_profile.php @@ -664,6 +664,13 @@ class ucp_profile $selected_driver = $phpbb_avatar_manager->clean_driver_name($request->variable('avatar_driver', $user->data['user_avatar_type'])); + $template->assign_vars(array( + 'AVATAR_MIN_WIDTH' => $config['avatar_min_width'], + 'AVATAR_MAX_WIDTH' => $config['avatar_max_width'], + 'AVATAR_MIN_HEIGHT' => $config['avatar_min_height'], + 'AVATAR_MAX_HEIGHT' => $config['avatar_max_height'], + )); + foreach ($avatar_drivers as $current_driver) { $driver = $phpbb_avatar_manager->get_driver($current_driver); |