Merge branch 'MDL-34205-master' of git://github.com/micaherne/moodle

2012-07-23 12:52:35 +12:00
parent df49074771 945a81a943
commit 18989c7a24
4 changed files with 5 additions and 2 deletions
@@ -3574,7 +3574,7 @@ class settings_navigation extends navigation_node {
            // Add the module chooser toggle
            $modchoosertoggleurl = clone($baseurl);
            if ($this->page->user_is_editing() && course_ajax_enabled($course)) {
-                if ($usemodchooser = get_user_preferences('usemodchooser', 1)) {
+                if ($usemodchooser = get_user_preferences('usemodchooser', $CFG->modchooserdefault)) {
                    $modchoosertogglestring = get_string('modchooserdisable', 'moodle');
                    $modchoosertoggleurl->param('modchooser', 'off');
                } else {