moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-32117 EQUELLA plugin: Remove warning when 'mimetypes' option is not set

Browse source
This commit is contained in:
nread 2012-05-17 16:10:57 +10:00 • committed by Dan Poltawski
parent 205f169edf
commit a3fde71746
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
repository/equella/lib.php
View file

@ -18,7 +18,7 @@ require_once($CFG->dirroot . '/repository/lib.php');
class repository_equella extends repository { class repository_equella extends repository {
/** @var array mimetype filter */ /** @var array mimetype filter */
private $mimetypes; private $mimetypes = array();
/** /**
* Constructor * Constructor
@ -30,11 +30,11 @@ class repository_equella extends repository {
public function __construct($repositoryid, $context = SYSCONTEXTID, $options = array()) { public function __construct($repositoryid, $context = SYSCONTEXTID, $options = array()) {
parent::__construct($repositoryid, $context, $options); parent::__construct($repositoryid, $context, $options);
if (!empty($this->options['mimetypes']) && !in_array('*', $this->options['mimetypes'])) { if (isset($this->options['mimetypes'])) {
$this->mimetypes = $this->options['mimetypes']; $mt = $this->options['mimetypes'];
$this->mimetypes = array_unique(array_map(array($this, 'toMimeType'), $this->options['mimetypes'])); if (!empty($mt) && !in_array('*', $mt)) {
} else { $this->mimetypes = array_unique(array_map(array($this, 'toMimeType'), $mt));
$this->mimetypes = array(); }
} }
} }