Permalink
Browse files

MDL-32914 fixed function get_imageinfo() to get rid of notice messages

  • Loading branch information...
1 parent 9a62f77 commit b7725e30c2455c848894171bba999fbe2c56d2bf @marinaglancy marinaglancy committed May 11, 2012
Showing with 8 additions and 1 deletion.
  1. +8 −1 lib/filestorage/stored_file.php
@@ -407,7 +407,14 @@ public function archive_file(file_archive $filearch, $archivepath) {
* @return mixed array with width, height and mimetype; false if not an image
*/
public function get_imageinfo() {
- if (!$imageinfo = getimagesize($this->get_content_file_location())) {
+ $path = $this->get_content_file_location();
+ if (!is_readable($path)) {
+ if (!$this->fs->try_content_recovery($this) or !is_readable($path)) {
+ throw new file_exception('storedfilecannotread', '', $path);
+ }
+ }
+ $mimetype = $this->get_mimetype();
+ if (!preg_match('|^image/|', $mimetype) || !filesize($path) || !($imageinfo = getimagesize($path))) {
return false;
}
$image = array('width'=>$imageinfo[0], 'height'=>$imageinfo[1], 'mimetype'=>image_type_to_mime_type($imageinfo[2]));

0 comments on commit b7725e3

Please sign in to comment.