Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
project
forena
Commits
c0fdf7e3
Commit
c0fdf7e3
authored
Apr 26, 2013
by
metzlerd
Browse files
Changed date format to default.
parent
706faf81
Changes
2
Hide whitespace changes
Inline
Side-by-side
FrxReport.inc
View file @
c0fdf7e3
...
...
@@ -571,10 +571,10 @@ class FrxReport {
case
'date_popup'
:
case
'date_select'
:
if
(
$value
){
$date_format
=
@
$options
[
'date_format'
]
?
$options
[
'date_format'
]
:
'Y-m-d'
;
$datetime
=
@
strtotime
(
$value
);
if
(
$datetime
)
{
$value
=
date
(
$
options
[
'
date_format
'
]
,
$datetime
);
$value
=
date
(
$date_format
,
$datetime
);
}
}
...
...
forena.module
View file @
c0fdf7e3
...
...
@@ -555,17 +555,16 @@ function forena_parameter_form($formid, &$form_state, $parameters, $attributes=
case
'date_text'
:
case
'date_select'
:
case
'date_popup'
:
if
(
@
$options
[
'date_format'
])
{
$ctl_attrs
[
'#date_format'
]
=
$options
[
'date_format'
];
if
(
$value
){
$datetime
=
@
strtotime
(
$value
);
if
(
$datetime
)
{
$value
=
date
(
$options
[
'date_format'
],
$datetime
);
}
$options
[
'date_format'
]
=
@
$options
[
'date_format'
]
?
$options
[
'date_format'
]
:
'Y-m-d'
;
$ctl_attrs
[
'#date_format'
]
=
$options
[
'date_format'
];
if
(
$value
){
$datetime
=
@
strtotime
(
$value
);
if
(
$datetime
)
{
$value
=
date
(
$options
[
'date_format'
],
$datetime
);
}
}
if
(
@
$options
[
'date_year_range'
])
{
$ctl_attrs
[
'#date_year_range'
]
=
$options
[
'date_year_range'
];
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment