Pierwszy plik w którym zostały zgłoszone konflikty: includes/acp/acp_board.php
BAKUP:
Kod: Zaznacz cały
'require_activation' => array('lang' => 'ACC_ACTIVATION', 'validate' => 'int', 'type' => 'custom',
Kod: Zaznacz cały
'require_activation' => array('lang' => 'ACC_ACTIVATION', 'validate' => 'int', 'type' => 'select',
TERAZ:
Kod: Zaznacz cały
'max_pass_chars'...
'min_pass_chars'
Kod: Zaznacz cały
function select_acc_activation($value, $key = '')
{
global $user, $config;
$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');
}
return h_radio('config[require_activation]', $radio_ary, $value, $key);
Kod: Zaznacz cały
function select_acc_activation($selected_value, $value)
{
global $user, $config;
$act_ary = array(
'ACC_DISABLE' => USER_ACTIVATION_DISABLE,
'ACC_NONE' => USER_ACTIVATION_NONE,
);
if ($config['email_enable'])
{
$act_ary['ACC_USER'] = USER_ACTIVATION_SELF;
$act_ary['ACC_ADMIN'] = USER_ACTIVATION_ADMIN;
}
$act_options = '';
foreach ($act_ary as $key => $value)
{
$selected = ($selected_value == $value) ? ' selected="selected"' : '';
$act_options .= '<option value="' . $value . '"' . $selected . '>' . $user->lang[$key] . '</option>';
}
return $act_options;