1
0
mirror of https://github.com/moodle/moodle.git synced 2025-04-23 01:20:07 +02:00

Merge branch 'wip-MDL-36453-master' of git://github.com/abgreeve/moodle

This commit is contained in:
Dan Poltawski 2012-11-20 14:31:53 +08:00
commit f2e1d671a9

@ -216,7 +216,7 @@ if (optional_param('sesskey', false, PARAM_BOOL) && confirm_sesskey()) {
} else if ($action == 'finishimport') {
$overwritesettings = optional_param('overwritesettings', false, PARAM_BOOL);
if (!$fullname) {
$presetdir = $CFG->tempdir.'/forms/'.required_param('directory', PARAM_ALPHANUMEXT);
$presetdir = $CFG->tempdir.'/forms/'.required_param('directory', PARAM_FILE);
if (!file_exists($presetdir) || !is_dir($presetdir)) {
print_error('cannotimport');
}