Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
moodle
moodle
Commits
64858d43
Commit
64858d43
authored
Jan 13, 2016
by
Andrew Nicols
Browse files
Merge branch 'MDL-52649-master' of
git://github.com/junpataleta/moodle
parents
1be8237d
9488b6f3
Changes
1
Hide whitespace changes
Inline
Side-by-side
user/index.php
View file @
64858d43
...
...
@@ -517,12 +517,12 @@ if ($roleid > 0) {
$a
->
role
=
$rolenames
[
$roleid
];
$heading
=
format_string
(
get_string
(
'xuserswiththerole'
,
'role'
,
$a
));
if
(
$currentgroup
and
$group
)
{
if
(
$currentgroup
and
!
empty
(
$group
)
)
{
$a
->
group
=
$group
->
name
;
$heading
.
=
' '
.
format_string
(
get_string
(
'ingroup'
,
'role'
,
$a
));
}
if
(
$accesssince
)
{
if
(
$accesssince
&&
!
empty
(
$timeoptions
[
$accesssince
])
)
{
$a
->
timeperiod
=
$timeoptions
[
$accesssince
];
$heading
.
=
' '
.
format_string
(
get_string
(
'inactiveformorethan'
,
'role'
,
$a
));
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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