MDL-12570 option to disable lang autodetect from browser; merged from MOODLE_19_STABLE

diff --git a/admin/settings/language.php b/admin/settings/language.php
index 379e5c031805b9ea25ca137b14730b54399bb4c0..0eabf7412de8e50ac4b60871a2a80a3a077b5d51 100644 (file)
--- a/admin/settings/language.php
+++ b/admin/settings/language.php
@@ -7,6 +7,7 @@ if ($hassiteconfig) { // speedup for non-admins, add all caps used on this page
 
 // "languageandlocation" settingpage
 $temp = new admin_settingpage('langsettings', get_string('languagesettings', 'admin'));
+$temp->add(new admin_setting_configcheckbox('autolang', get_string('autolang', 'admin'), get_string('configautolang', 'admin'), 1));
 $temp->add(new admin_setting_configselect('lang', get_string('lang', 'admin'), get_string('configlang', 'admin'), current_language(), get_list_of_languages())); // $CFG->lang might be set in installer already, default en or en_utf8 is in setup.php
 $temp->add(new admin_setting_configcheckbox('langmenu', get_string('langmenu', 'admin'), get_string('configlangmenu', 'admin'), 1));
 $temp->add(new admin_setting_langlist());