Merge branch 'MDL-50289-29-notes' of git://github.com/mudrd8mz/moodle into MOODLE_29_STABLE

2015-05-26 12:23:34 +08:00
parent fdfea113b5 32eb50d49b
commit 6e54261fe8
1 changed files with 7 additions and 0 deletions
@@ -379,6 +379,13 @@ function note_view($context, $userid) {
 * @return bool
 */
 function core_notes_myprofile_navigation(core_user\output\myprofile\tree $tree, $user, $iscurrentuser, $course) {
+    global $CFG;
+
+    if (empty($CFG->enablenotes)) {
+        // Notes are disabled, nothing to do.
+        return false;
+    }
+
    $url = new moodle_url("/notes/index.php", array('user' => $user->id));
    $title = get_string('notes', 'core_notes');
    if (empty($course)) {