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

2016-10-31 19:47:40 +01:00
parent de1af8a6ed 0f13ffbc63
commit 7aa17ce256
1 changed files with 1 additions and 1 deletions
@@ -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;
    }