Skip to content
Browse files

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

  • Loading branch information...
2 parents c3f06aa + 10654e3 commit a88258ac9f8f2a6a016cd2a22fbfef6eafd3a35a @stronk7 stronk7 committed Oct 1, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 mod/resource/lib.php
View
4 mod/resource/lib.php
@@ -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);

0 comments on commit a88258a

Please sign in to comment.
Something went wrong with that request. Please try again.