Merge branch 'MDL-52798_m32v2' of https://github.com/sbourget/moodle

2016-09-12 12:17:40 +01:00
parent 0fcbfb63a5 9629790b1b
commit 2a786e7bad
11 changed files with 224 additions and 120 deletions
@@ -4443,6 +4443,15 @@ class settings_navigation extends navigation_node {
            }
        }

+        // Add "Calendar preferences" link.
+        if (isloggedin() && !isguestuser($user)) {
+            if ($currentuser && has_capability('moodle/user:editownprofile', $systemcontext) ||
+                    has_capability('moodle/user:editprofile', $usercontext)) {
+                $url = new moodle_url('/user/calendar.php', array('id' => $user->id));
+                $useraccount->add(get_string('calendarpreferences', 'calendar'), $url, self::TYPE_SETTING, null, 'preferredcalendar');
+            }
+        }
+
        // View the roles settings.
        if (has_any_capability(array('moodle/role:assign', 'moodle/role:safeoverride', 'moodle/role:override',
                'moodle/role:manage'), $usercontext)) {