makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/merging-style-components] Fixing few errors in acp_styles

Browse source 
Fixing notices and usability issues

PHPBB3-10632
This commit is contained in:
Vjacheslav Trushkin 2012-03-31 17:04:17 +03:00
parent bc46cfd6e5
commit 9611997552
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/includes/acp/acp_styles.php
View file

@ -181,10 +181,6 @@ class acp_styles
trigger_error($user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING); trigger_error($user->lang['NO_MATCHING_STYLES_FOUND'] . adm_back_link($this->u_action), E_USER_WARNING);
} }
$message = implode('<br />', $messages); $message = implode('<br />', $messages);
if (count($messages) == 1 && $last_installed !== false)
{
$message .= '<br /><br />' . sprintf($user->lang['STYLE_INSTALLED_EDIT_DETAILS'], $this->u_base_action . '&amp;mode=style&amp;action=details&amp;id=' . $last_installed);
}
$message .= '<br /><br />' . sprintf($user->lang['STYLE_INSTALLED_RETURN_STYLES'], $this->u_base_action . '&amp;mode=style'); $message .= '<br /><br />' . sprintf($user->lang['STYLE_INSTALLED_RETURN_STYLES'], $this->u_base_action . '&amp;mode=style');
$message .= '<br /><br />' . sprintf($user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED'], $this->u_base_action . '&amp;mode=install'); $message .= '<br /><br />' . sprintf($user->lang['STYLE_INSTALLED_RETURN_UNINSTALLED'], $this->u_base_action . '&amp;mode=install');
trigger_error($message, E_USER_NOTICE); trigger_error($message, E_USER_NOTICE);
@ -556,7 +552,6 @@ class acp_styles
$users = $this->get_users(); $users = $this->get_users();
// Add users counter to rows // Add users counter to rows
$style['_users'] = array();
foreach ($styles as &$style) foreach ($styles as &$style)
{ {
$style['_users'] = isset($users[$style['style_id']]) ? $users[$style['style_id']] : 0; $style['_users'] = isset($users[$style['style_id']]) ? $users[$style['style_id']] : 0;
@ -892,7 +887,7 @@ class acp_styles
// Additional data // Additional data
'DEFAULT' => ($style['style_id'] && $style['style_id'] == $config['default_style']), 'DEFAULT' => ($style['style_id'] && $style['style_id'] == $config['default_style']),
'USERS' => $style['_users'], 'USERS' => (isset($style['_users'])) ? $style['_users'] : '',
'LEVEL' => $level, 'LEVEL' => $level,
'PADDING' => (4 + 16 * $level), 'PADDING' => (4 + 16 * $level),
'SHOW_COPYRIGHT' => ($style['style_id']) ? false : true, 'SHOW_COPYRIGHT' => ($style['style_id']) ? false : true,