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

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10067] Clarify language for user activation options in ACP.
This commit is contained in:
Nils Adermann
2011-06-05 02:50:17 +02:00
parent a30ec6e052 a9f4e00234
commit cc14f4b9e0
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -773,12 +773,18 @@ 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);
if ($config['email_enable'])
{
$radio_ary += array(USER_ACTIVATION_SELF => 'ACC_USER', USER_ACTIVATION_ADMIN => 'ACC_ADMIN');
$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);
}
return h_radio('config[require_activation]', $radio_ary, $value, $key);
return $radio_text;
}
/**