Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
integration
prechecker
Commits
d84ddfda
Commit
d84ddfda
authored
Nov 09, 2015
by
David Monllaó
Browse files
Merge branch 'MDL-49473-28' of
git://github.com/danpoltawski/moodle
into MOODLE_28_STABLE
parents
ae1854f5
992591e0
Changes
1
Hide whitespace changes
Inline
Side-by-side
report/log/classes/table_log.php
View file @
d84ddfda
...
...
@@ -112,8 +112,13 @@ class report_log_table_log extends table_sql {
* @return string HTML for the time column
*/
public
function
col_time
(
$event
)
{
$recenttimestr
=
get_string
(
'strftimerecent'
,
'core_langconfig'
);
return
userdate
(
$event
->
timecreated
,
$recenttimestr
);
if
(
empty
(
$this
->
download
))
{
$dateformat
=
get_string
(
'strftimerecent'
,
'core_langconfig'
);
}
else
{
$dateformat
=
get_string
(
'strftimedatetimeshort'
,
'core_langconfig'
);
}
return
userdate
(
$event
->
timecreated
,
$dateformat
);
}
/**
...
...
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