L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

weblib: build_navigation() try to avoid pointless capchecks

Browse Source 
Prevent calls to has_capability() in build_navigation() from messing
with upgrades.

Most calls to has_capability() in weblib should be moved to the callers.
This commit is contained in:
martinlanghoff
2007-09-19 07:52:42 +00:00
parent 6b4d8c4d58
commit 8f9a180282
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/weblib.php
+12 -1
View File
@@ -3370,7 +3370,18 @@ function build_navigation($extranavlinks) {
continue;
}
// Check the link type to see if this link should appear in the trail
$cap = has_capability('moodle/course:manageactivities', get_context_instance(CONTEXT_COURSE, $COURSE->id));
//
// NOTE: we should move capchecks _out_ to the callers. build_navigation() is
// called from many places -- install & upgrade for example -- where we cannot
// count on the roles infrastructure to be defined.
//
$cap = 0;
if (!empty($COURSE->id) && $COURSE->id != SITEID) {
if (!isset($COURSE->context)) {
$COURSE->context = get_context_instance(CONTEXT_COURSE, $COURSE->id);
}
$cap = has_capability('moodle/course:manageactivities', $COURSE->context);
}
$hidetype_is2 = $CFG->hideactivitytypenavlink == 2;
$hidetype_is1 = $CFG->hideactivitytypenavlink == 1;