mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10067] Add separator to h_radio to place options on individual lines

Conflicts:
	phpBB/adm/index.php
This commit is contained in:
Andreas Fischer
2011-06-06 11:06:01 +02:00
parent b55bfb459e 759f8d5c2c
commit ad90f262ff
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
phpBB/includes/acp/acp_board.php
View File

@@ -772,18 +772,19 @@ class acp_board
{
global $user, $config;
$radio_ary = array(USER_ACTIVATION_DISABLE => 'ACC_DISABLE', USER_ACTIVATION_NONE => 'ACC_NONE');
$radio_text = h_radio('config[require_activation]', $radio_ary, $value, $key);
$radio_ary = array(
USER_ACTIVATION_DISABLE => 'ACC_DISABLE',
USER_ACTIVATION_NONE => 'ACC_NONE',
);
if ($config['email_enable'])
{
$radio_ary = array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
// With longer labels the four options no longer fit
// onto a single line. Separate them onto two lines.
// This also requires two h_radio calls to generate HTML.
$radio_text .= '<br /><br />';
$radio_text .= h_radio('config[require_activation]', $radio_ary, $value, $key);
$radio_ary[USER_ACTIVATION_SELF] = 'ACC_USER';
$radio_ary[USER_ACTIVATION_ADMIN] = 'ACC_ADMIN';
}
$radio_text = h_radio('config[require_activation]', $radio_ary, $value, 'require_activation', $key, '<br />');
return $radio_text;
}