Merge branch 'MDL-57064-master' of git://github.com/FMCorz/moodle

course/lib.php

@@ -3707,7 +3707,19 @@ function course_get_user_navigation_options($context, $course = null) {
         $sitecontext = context_system::instance();
     }
 
-    $options = new stdClass;
+    // Sets defaults for all options.
+    $options = (object) [
+        'badges' => false,
+        'blogs' => false,
+        'calendar' => false,
+        'competencies' => false,
+        'grades' => false,
+        'notes' => false,
+        'participants' => false,
+        'search' => false,
+        'tags' => false,
+    ];
+
     $options->blogs = !empty($CFG->enableblogs) &&
                         ($CFG->bloglevel == BLOG_GLOBAL_LEVEL ||
                         ($CFG->bloglevel == BLOG_SITE_LEVEL and ($isloggedin and !$isguestuser)))

course/tests/courselib_test.php

@@ -2935,12 +2935,20 @@ class core_course_courselib_testcase extends advanced_testcase {
         $this->assertTrue($navoptions->tags);
         $this->assertFalse($navoptions->search);
         $this->assertTrue($navoptions->calendar);
+        $this->assertTrue($navoptions->competencies);
 
         // Enable global search now.
         $CFG->enableglobalsearch = 1;
         $navoptions = course_get_user_navigation_options($context, $course);
         $this->assertTrue($navoptions->search);
 
+        // Disable competencies.
+        $oldcompetencies = get_config('core_competency', 'enabled');
+        set_config('enabled', false, 'core_competency');
+        $navoptions = course_get_user_navigation_options($context, $course);
+        $this->assertFalse($navoptions->competencies);
+        set_config('enabled', $oldcompetencies, 'core_competency');
+
         // Now try with a standard user.
         $user = $this->getDataGenerator()->create_user();
         $this->setUser($user);