Merge branch 'MDL-49006' of git://github.com/timhunt/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2015-02-09 19:32:40 +01:00
commit e7b63ac788
7 changed files with 7 additions and 7 deletions

View File

@ -30,7 +30,7 @@ if ($ADMIN->fulltree) {
// General settings
$settings->add(new admin_setting_configcheckbox('book/requiremodintro',
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 1));
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 0));
$options = book_get_numbering_types();

View File

@ -28,7 +28,7 @@ defined('MOODLE_INTERNAL') || die;
if ($ADMIN->fulltree) {
//--- general settings -----------------------------------------------------------------------------------
$settings->add(new admin_setting_configcheckbox('folder/requiremodintro',
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 1));
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 0));
$settings->add(new admin_setting_configcheckbox('folder/showexpanded',
get_string('showexpanded', 'folder'),

View File

@ -28,7 +28,7 @@ if ($ADMIN->fulltree) {
// General settings.
$settings->add(new admin_setting_configcheckbox('imscp/requiremodintro', get_string('requiremodintro', 'admin'),
get_string('configrequiremodintro', 'admin'), 1));
get_string('configrequiremodintro', 'admin'), 0));
// Modedit defaults.
$settings->add(new admin_setting_heading('imscpmodeditdefaults',

View File

@ -67,5 +67,5 @@ if ($ADMIN->fulltree) {
$settings->add(new admin_setting_configselect('lesson_defaultnextpage', get_string('actionaftercorrectanswer','lesson'),
get_string('configactionaftercorrectanswer', 'lesson'), 0, $defaultnextpages));
$settings->add(new admin_setting_configcheckbox('lesson/requiremodintro',
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 1));
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 0));
}

View File

@ -33,7 +33,7 @@ if ($ADMIN->fulltree) {
//--- general settings -----------------------------------------------------------------------------------
$settings->add(new admin_setting_configcheckbox('page/requiremodintro',
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 1));
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 0));
$settings->add(new admin_setting_configmultiselect('page/displayoptions',
get_string('displayoptions', 'page'), get_string('configdisplayoptions', 'page'),
$defaultdisplayoptions, $displayoptions));

View File

@ -47,7 +47,7 @@ if ($ADMIN->fulltree) {
$settings->add(new admin_setting_configtext('resource/framesize',
get_string('framesize', 'resource'), get_string('configframesize', 'resource'), 130, PARAM_INT));
$settings->add(new admin_setting_configcheckbox('resource/requiremodintro',
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 1));
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 0));
$settings->add(new admin_setting_configmultiselect('resource/displayoptions',
get_string('displayoptions', 'resource'), get_string('configdisplayoptions', 'resource'),
$defaultdisplayoptions, $displayoptions));

View File

@ -45,7 +45,7 @@ if ($ADMIN->fulltree) {
$settings->add(new admin_setting_configtext('url/framesize',
get_string('framesize', 'url'), get_string('configframesize', 'url'), 130, PARAM_INT));
$settings->add(new admin_setting_configcheckbox('url/requiremodintro',
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 1));
get_string('requiremodintro', 'admin'), get_string('configrequiremodintro', 'admin'), 0));
$settings->add(new admin_setting_configpasswordunmask('url/secretphrase', get_string('password'),
get_string('configsecretphrase', 'url'), ''));
$settings->add(new admin_setting_configcheckbox('url/rolesinparams',