L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marina Glancy
2012-05-21 11:57:53 +08:00
parent 9a62f7799b
commit b7725e30c2
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/filestorage/stored_file.php
+8 -1
View File
@@ -407,7 +407,14 @@ class stored_file {
* @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]));