Merge branch 'MDL-39209_master' of git://github.com/totara/openbadges

2013-05-13 14:59:37 +08:00
parent 2c59e0ffaa 85d7399e20
commit a02e36d682
10 changed files with 42 additions and 13 deletions
@@ -2498,7 +2498,7 @@ class global_navigation extends navigation_node {
        }

        //Badges
-        if (!empty($CFG->enablebadges) && has_capability('moodle/badges:viewbadges', $this->page->context)) {
+        if (!empty($CFG->enablebadges) && !empty($CFG->badges_allowcoursebadges) && 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);
        }