moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-48266-master' of git://github.com/FMCorz/moodle

Browse source 
Conflicts:
	version.php
This commit is contained in:
Eloy Lafuente (stronk7) 2015-01-26 19:19:35 +01:00
commit 16dafa5d9f
6 changed files with 64 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
admin/settings/courses.php
View file

@ -221,7 +221,7 @@ if ($hassiteconfig or has_any_capability($capabilities, $systemcontext)) {
2 => new lang_string('storagecourseandexternal', 'backup')
);
$temp->add(new admin_setting_configselect('backup/backup_auto_storage', new lang_string('automatedstorage', 'backup'), new lang_string('automatedstoragehelp', 'backup'), 0, $storageoptions));
$temp->add(new admin_setting_configdirectory('backup/backup_auto_destination', new lang_string('saveto'), new lang_string('backupsavetohelp'), ''));
$temp->add(new admin_setting_special_backup_auto_destination());
$keepoptoins = array(
0 => new lang_string('all'), 1 => '1',
2 => '2',