Merge branch 'develop' of projects.ceondo.com:indefero into feature.scilab

This commit is contained in:
Thomas Keller
2011-12-03 01:21:57 +01:00
55 changed files with 27745 additions and 17228 deletions

View File

@@ -86,7 +86,7 @@ class IDF_Form_WikiResourceUpdate extends Pluf_Form
list($mimeType, , $extension) = IDF_FileUtil::getMimeType($this->getTempUploadPath().$this->cleaned_data['file']);
if ($this->resource->mime_type != $mimeType) {
throw new Pluf_Form_Invalid(sprintf(
__('The mime type of the uploaded file "%s" does not match the mime type of this resource "%s"'),
__('The mime type of the uploaded file "%1$s" does not match the mime type of this resource "%2$s"'),
$mimeType, $this->resource->mime_type
));
}