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
moodle
moodle
Commits
45ad1693
Commit
45ad1693
authored
Oct 28, 2014
by
Sam Hemelryk
Browse files
MDL-47183 post-integration fixes
* Fixed typo with context_module::instance * Fixed use of $mod->get_context()
parent
5baf74a3
Changes
4
Hide whitespace changes
Inline
Side-by-side
blocks/site_main_menu/block_site_main_menu.php
View file @
45ad1693
...
...
@@ -128,7 +128,7 @@ class block_site_main_menu extends block_list {
}
else
{
$editbuttons
=
''
;
}
if
(
$mod
->
visible
||
has_capability
(
'moodle/course:viewhiddenactivities'
,
$mod
->
get_
context
()
))
{
if
(
$mod
->
visible
||
has_capability
(
'moodle/course:viewhiddenactivities'
,
$mod
->
context
))
{
if
(
$ismoving
)
{
if
(
$mod
->
id
==
$USER
->
activitycopy
)
{
continue
;
...
...
blocks/social_activities/block_social_activities.php
View file @
45ad1693
...
...
@@ -130,7 +130,7 @@ class block_social_activities extends block_list {
}
else
{
$editbuttons
=
''
;
}
if
(
$mod
->
visible
||
has_capability
(
'moodle/course:viewhiddenactivities'
,
$mod
->
get_
context
()
))
{
if
(
$mod
->
visible
||
has_capability
(
'moodle/course:viewhiddenactivities'
,
$mod
->
context
))
{
if
(
$ismoving
)
{
if
(
$mod
->
id
==
$USER
->
activitycopy
)
{
continue
;
...
...
course/format/singleactivity/lib.php
View file @
45ad1693
...
...
@@ -79,7 +79,7 @@ class format_singleactivity extends format_base {
$orphanednode
->
nodetype
=
navigation_node
::
NODETYPE_BRANCH
;
$orphanednode
->
add_class
(
'orphaned'
);
foreach
(
$modinfo
->
sections
[
1
]
as
$cmid
)
{
if
(
has_capability
(
'moodle/course:viewhiddenactivities'
,
context_module
(
$cmid
)))
{
if
(
has_capability
(
'moodle/course:viewhiddenactivities'
,
context_module
::
instance
(
$cmid
)))
{
$this
->
navigation_add_activity
(
$orphanednode
,
$modinfo
->
cms
[
$cmid
]);
}
}
...
...
course/renderer.php
View file @
45ad1693
...
...
@@ -770,7 +770,7 @@ class core_course_renderer extends plugin_renderer_base {
if
(
$mod
->
uservisible
)
{
$conditionalhidden
=
$this
->
is_cm_conditionally_hidden
(
$mod
);
$accessiblebutdim
=
(
!
$mod
->
visible
||
$conditionalhidden
)
&&
has_capability
(
'moodle/course:viewhiddenactivities'
,
$mod
->
get_
context
()
);
has_capability
(
'moodle/course:viewhiddenactivities'
,
$mod
->
context
);
if
(
$accessiblebutdim
)
{
$linkclasses
.
=
' dimmed'
;
$textclasses
.
=
' dimmed_text'
;
...
...
@@ -827,7 +827,7 @@ class core_course_renderer extends plugin_renderer_base {
if
(
$mod
->
uservisible
)
{
$conditionalhidden
=
$this
->
is_cm_conditionally_hidden
(
$mod
);
$accessiblebutdim
=
(
!
$mod
->
visible
||
$conditionalhidden
)
&&
has_capability
(
'moodle/course:viewhiddenactivities'
,
$mod
->
get_
context
()
);
has_capability
(
'moodle/course:viewhiddenactivities'
,
$mod
->
context
);
if
(
$accessiblebutdim
)
{
$textclasses
.
=
' dimmed_text'
;
if
(
$conditionalhidden
)
{
...
...
Write
Preview
Supports
Markdown
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