Merge branch 'wip-MDL-34234-m23' of git://github.com/samhemelryk/moodle into MOODLE_23_STABLE

This commit is contained in:
Eloy Lafuente (stronk7)
2012-10-01 13:10:06 +02:00
+2 -2
View File
@@ -512,8 +512,8 @@ function resource_dndupload_handle($uploadinfo) {
$data->popupwidth = $config->popupwidth;
$data->printheading = $config->printheading;
$data->printintro = $config->printintro;
$data->showsize = $config->showsize;
$data->showtype = $config->showtype;
$data->showsize = (isset($config->showsize)) ? $config->showsize : 0;
$data->showtype = (isset($config->showtype)) ? $config->showtype : 0;
$data->filterfiles = $config->filterfiles;
return resource_add_instance($data, null);