mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 14:41:29 +01:00
Fix for bug #447188.
This commit is contained in:
parent
b20c072d9e
commit
d1ecda416d
@ -2628,7 +2628,7 @@
|
|||||||
$var[] = Array(
|
$var[] = Array(
|
||||||
'field' => lang('Start Date'),
|
'field' => lang('Start Date'),
|
||||||
'data' => $phpgw->common->dateformatorder(
|
'data' => $phpgw->common->dateformatorder(
|
||||||
$sb->getYears('start[year]',intval($phpgw->common->show_date($start,'Y')),intval($phpgw->common->show_date($start,'Y'))),
|
$sb->getYears('start[year]',intval($phpgw->common->show_date($start,'Y'))),
|
||||||
$sb->getMonthText('start[month]',intval($phpgw->common->show_date($start,'n'))),
|
$sb->getMonthText('start[month]',intval($phpgw->common->show_date($start,'n'))),
|
||||||
$sb->getDays('start[mday]',intval($phpgw->common->show_date($start,'d')))
|
$sb->getDays('start[mday]',intval($phpgw->common->show_date($start,'d')))
|
||||||
)
|
)
|
||||||
@ -2649,7 +2649,7 @@
|
|||||||
$var[] = Array(
|
$var[] = Array(
|
||||||
'field' => lang('End Date'),
|
'field' => lang('End Date'),
|
||||||
'data' => $phpgw->common->dateformatorder(
|
'data' => $phpgw->common->dateformatorder(
|
||||||
$sb->getYears('end[year]',intval($phpgw->common->show_date($end,'Y')),intval($phpgw->common->show_date($end,'Y'))),
|
$sb->getYears('end[year]',intval($phpgw->common->show_date($end,'Y'))),
|
||||||
$sb->getMonthText('end[month]',intval($phpgw->common->show_date($end,'n'))),
|
$sb->getMonthText('end[month]',intval($phpgw->common->show_date($end,'n'))),
|
||||||
$sb->getDays('end[mday]',intval($phpgw->common->show_date($end,'d')))
|
$sb->getDays('end[mday]',intval($phpgw->common->show_date($end,'d')))
|
||||||
)
|
)
|
||||||
@ -2765,7 +2765,7 @@
|
|||||||
'field' => lang('Repeat End Date'),
|
'field' => lang('Repeat End Date'),
|
||||||
'data' => '<input type="checkbox" name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').' '
|
'data' => '<input type="checkbox" name="cal[rpt_use_end]" value="y"'.$checked.'>'.lang('Use End Date').' '
|
||||||
.$phpgw->common->dateformatorder(
|
.$phpgw->common->dateformatorder(
|
||||||
$sb->getYears('recur_enddate[year]',intval($phpgw->common->show_date($recur_end,'Y')),intval($phpgw->common->show_date($recur_end,'Y'))),
|
$sb->getYears('recur_enddate[year]',intval($phpgw->common->show_date($recur_end,'Y'))),
|
||||||
$sb->getMonthText('recur_enddate[month]',intval($phpgw->common->show_date($recur_end,'n'))),
|
$sb->getMonthText('recur_enddate[month]',intval($phpgw->common->show_date($recur_end,'n'))),
|
||||||
$sb->getDays('recur_enddate[mday]',intval($phpgw->common->show_date($recur_end,'d')))
|
$sb->getDays('recur_enddate[mday]',intval($phpgw->common->show_date($recur_end,'d')))
|
||||||
)
|
)
|
||||||
|
@ -409,13 +409,13 @@
|
|||||||
{
|
{
|
||||||
if (!$startYear)
|
if (!$startYear)
|
||||||
{
|
{
|
||||||
$startYear = date('Y') - 2;
|
$startYear = date('Y') - 5;
|
||||||
}
|
}
|
||||||
if ($selected && $startYear > $selected) $startYear = $selected;
|
if ($selected && $startYear > $selected) $startYear = $selected;
|
||||||
|
|
||||||
if (!$endyear)
|
if (!$endyear)
|
||||||
{
|
{
|
||||||
$endyear = date('Y') + 5;
|
$endyear = date('Y') + 6;
|
||||||
}
|
}
|
||||||
if ($selected && $endYear < $selected) $endYear = $selected;
|
if ($selected && $endYear < $selected) $endYear = $selected;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user