Merge branch 'wip-MDL-40159-m23' of git://github.com/marinaglancy/moodle into MOODLE_23_STABLE

This commit is contained in:
Sam Hemelryk
2013-06-18 09:03:54 +12:00
+3 -4
View File
@@ -3604,12 +3604,11 @@ class settings_navigation extends navigation_node {
$editstring = get_string('turneditingon');
}
$coursenode->add($editstring, $editurl, self::TYPE_SETTING, null, null, new pix_icon('i/edit', ''));
}
if (has_capability('moodle/course:manageactivities', $coursecontext)) {
// Add the module chooser toggle
$modchoosertoggleurl = clone($baseurl);
if ($this->page->user_is_editing() && course_ajax_enabled($course)) {
if ($this->page->user_is_editing() && has_capability('moodle/course:manageactivities', $coursecontext)
&& course_ajax_enabled($course)) {
$modchoosertoggleurl = clone($baseurl);
if ($usemodchooser = get_user_preferences('usemodchooser', $CFG->modchooserdefault)) {
$modchoosertogglestring = get_string('modchooserdisable', 'moodle');
$modchoosertoggleurl->param('modchooser', 'off');