mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

[ticket/15233] Standardize variable generation

Browse Source 
PHPBB3-15233
This commit is contained in:
mrgoldy
2020-05-10 14:58:57 +02:00
committed by Marc Alexander
parent 3796a4207f
commit d77415dbab
26 changed files with 163 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phpBB/includes/acp/acp_groups.php
View File

@@ -721,8 +721,6 @@ class acp_groups
}
}
$group_avatar = $group_helper->get_avatar($group_row, 'GROUP_AVATAR', true);
if (isset($phpbb_avatar_manager) && !$update)
{
// Merge any avatar errors into the primary error array
@@ -742,6 +740,12 @@ class acp_groups
break;
}
/** @var \phpbb\avatar\helper $avatar_helper */
$avatar_helper = $phpbb_container->get('avatar.helper');
$group_avatar = $avatar_helper->get_group_avatar($group_row, 'GROUP_AVATAR', true);
$template->assign_vars($avatar_helper->get_template_vars($group_avatar));
$template->assign_vars(array(
'S_EDIT' => true,
'S_ADD_GROUP' => ($action == 'add') ? true : false,
@@ -771,13 +775,6 @@ class acp_groups
'S_RANK_OPTIONS' => $rank_options,
'S_GROUP_OPTIONS' => group_select_options(false, false, (($user->data['user_type'] == USER_FOUNDER) ? false : 0)),
'AVATAR' => empty($group_avatar['html']) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $group_avatar['html'],
'AVATAR_LAZY' => $group_avatar['lazy'],
'AVATAR_SRC' => $group_avatar['src'],
'AVATAR_TITLE' => $group_avatar['title'],
'AVATAR_TYPE' => $group_avatar['type'],
'AVATAR_WIDTH' => $group_avatar['width'],
'AVATAR_HEIGHT' => $group_avatar['height'],
'AVATAR_MAX_FILESIZE' => $config['avatar_filesize'],
'GROUP_TYPE_FREE' => GROUP_FREE,

15
phpBB/includes/acp/acp_users.php
View File

@@ -1972,24 +1972,17 @@ class acp_users
$avatar_helper = $phpbb_container->get('avatar.helper');
$avatar = $avatar_helper->get_user_avatar($user_row, 'USER_AVATAR', true);
$template->assign_vars($avatar_helper->get_template_vars($avatar));
$template->assign_vars(array(
'S_AVATAR' => true,
'ERROR' => (!empty($error)) ? implode('<br />', $error) : '',
'AVATAR' => empty($avatar['html']) ? '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />' : $avatar['html'],
'AVATAR_LAZY' => $avatar['lazy'],
'AVATAR_SOURCE' => $avatar['src'],
'AVATAR_TITLE' => $avatar['title'],
'AVATAR_TYPE' => $avatar['type'],
'AVATAR_WIDTH' => $avatar['width'],
'AVATAR_HEIGHT' => $avatar['height'],
'S_AVATAR' => true,
'ERROR' => !empty($error) ? implode('<br />', $error) : '',
'S_FORM_ENCTYPE' => ' enctype="multipart/form-data"',
'L_AVATAR_EXPLAIN' => $user->lang(($config['avatar_filesize'] == 0) ? 'AVATAR_EXPLAIN_NO_FILESIZE' : 'AVATAR_EXPLAIN', $config['avatar_max_width'], $config['avatar_max_height'], $config['avatar_filesize'] / 1024),
'S_AVATARS_ENABLED' => ($config['allow_avatar'] && $avatars_enabled),
'S_AVATARS_ENABLED' => ($config['allow_avatar'] && $avatars_enabled),
));
break;