MDL-35073 Badges - Set of minor fixes for issues found during integration

This commit is contained in:
Damyon Wiese
2013-04-02 15:55:21 +08:00
parent 278065528a
commit 2188a69799
8 changed files with 11 additions and 7 deletions
+2 -2
View File
@@ -2182,7 +2182,7 @@ class global_navigation extends navigation_node {
$usernode->add(get_string('myfiles'), $url, self::TYPE_SETTING);
}
if ($CFG->enablebadges && $iscurrentuser &&
if (!empty($CFG->enablebadges) && $iscurrentuser &&
has_capability('moodle/badges:manageownbadges', context_user::instance($USER->id))) {
$url = new moodle_url('/badges/mybadges.php');
$usernode->add(get_string('mybadges', 'badges'), $url, self::TYPE_SETTING);
@@ -2511,7 +2511,7 @@ class global_navigation extends navigation_node {
}
//Badges
if ($CFG->enablebadges && has_capability('moodle/badges:viewbadges', $this->page->context)) {
if (!empty($CFG->enablebadges) && has_capability('moodle/badges:viewbadges', $this->page->context)) {
$url = new moodle_url($CFG->wwwroot . '/badges/view.php', array('type' => 1));
$coursenode->add(get_string('sitebadges', 'badges'), $url, navigation_node::TYPE_CUSTOM);
}