Merge branch 'MDL-56297-master' of git://github.com/damyon/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2016-10-31 19:28:54 +01:00
commit 7aa17ce256

View File

@ -185,7 +185,7 @@ EOD;
public function export_for_template(renderer_base $output) {
$context = $this->export_for_template_base($output);
$context['filepickerhtml'] = $this->getFilePickerHTML();
$context['filepickerhtml'] = !empty($this->_options['usefilepicker']) ? $this->getFilePickerHTML() : '';
return $context;
}