mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-08 19:21:40 +09:00
Fix #1334 hide limit_date if it's in the past
This commit is contained in:
parent
dd603639e0
commit
10d15b3470
2 changed files with 15 additions and 1 deletions
|
|
@ -98,10 +98,19 @@ class memberAdminController extends member
|
||||||
unset($all_args->use_editor);
|
unset($all_args->use_editor);
|
||||||
unset($all_args->use_html);
|
unset($all_args->use_html);
|
||||||
unset($all_args->reset_password);
|
unset($all_args->reset_password);
|
||||||
if(!isset($args->limit_date)) $args->limit_date = "";
|
|
||||||
$extra_vars = delObjectVars($all_args, $args);
|
$extra_vars = delObjectVars($all_args, $args);
|
||||||
$args->extra_vars = serialize($extra_vars);
|
$args->extra_vars = serialize($extra_vars);
|
||||||
|
|
||||||
|
// Delete invalid or past limit dates #1334
|
||||||
|
if (!isset($args->limit_date))
|
||||||
|
{
|
||||||
|
$args->limit_date = '';
|
||||||
|
}
|
||||||
|
elseif ($args->limit_date < date('Ymd'))
|
||||||
|
{
|
||||||
|
$args->limit_date = '';
|
||||||
|
}
|
||||||
|
|
||||||
// remove whitespace
|
// remove whitespace
|
||||||
$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
|
$checkInfos = array('user_id', 'user_name', 'nick_name', 'email_address');
|
||||||
foreach($checkInfos as $val)
|
foreach($checkInfos as $val)
|
||||||
|
|
|
||||||
|
|
@ -461,6 +461,11 @@ class memberAdminView extends member
|
||||||
$identifierForm->value = $member_info->{$member_config->identifier};
|
$identifierForm->value = $member_info->{$member_config->identifier};
|
||||||
Context::set('identifierForm', $identifierForm);
|
Context::set('identifierForm', $identifierForm);
|
||||||
|
|
||||||
|
if ($member_info->limit_date < date('Ymd'))
|
||||||
|
{
|
||||||
|
$member_info->limit_date = '';
|
||||||
|
}
|
||||||
|
|
||||||
$member_unauthenticated = false;
|
$member_unauthenticated = false;
|
||||||
if ($member_info->member_srl && $member_info->denied !== 'N')
|
if ($member_info->member_srl && $member_info->denied !== 'N')
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue