diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-02-14 11:18:45 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-02-14 11:18:45 -0800 |
| commit | 6c861a014d247efdc967c8e6ce567d73cd3c2cd4 (patch) | |
| tree | e9e52719fe1a82db507c8ca9590b552c25e53709 /modules | |
| parent | e5ed05004f005bdccdbf68e199ae2324ad97e895 (diff) | |
| parent | 27be4ae6064b8609a641f4bf239999d5a8ec2c60 (diff) | |
Merge pull request #133 from shadlaws/followon_1994
Follow-on to 0312d1b071bd4434ddb3f82888b0323da6bf3732 for #1994.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/gallery/helpers/movie.php | 4 | ||||
| -rw-r--r-- | modules/gallery/helpers/photo.php | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/modules/gallery/helpers/movie.php b/modules/gallery/helpers/movie.php index eda478c7..863e1cf9 100644 --- a/modules/gallery/helpers/movie.php +++ b/modules/gallery/helpers/movie.php @@ -163,9 +163,7 @@ class movie_Core { * -> return metadata from ffmpeg * Input is *not* standard movie type that is *not* supported by ffmpeg but is legal * -> return zero width, height, and duration; mime type and extension according to legal_file - * Input is *not* standard movie type that is *not* supported by ffmpeg and is *not* legal - * -> return zero width, height, and duration; null mime type and extension - * Input is not readable or does not exist + * Input is illegal, unidentifiable, unreadable, or does not exist * -> throw exception * Note: movie_get_file_metadata events can change any of the above cases (except the last one). */ diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php index 2d32f0d3..004cc7c4 100644 --- a/modules/gallery/helpers/photo.php +++ b/modules/gallery/helpers/photo.php @@ -94,10 +94,8 @@ class photo_Core { * Input is *not* standard photo type that is supported by getimagesize (e.g. tif, bmp...) * -> return metadata from getimagesize() * Input is *not* standard photo type that is *not* supported by getimagesize but is legal - * -> return zero width and height, mime type and extension according to legal_file - * Input is *not* standard photo type that is *not* supported by getimagesize and is *not* legal - * -> return zero width and height, null mime type and extension - * Input is not readable or does not exist + * -> return metadata if found by photo_get_file_metadata events + * Input is illegal, unidentifiable, unreadable, or does not exist * -> throw exception * Note: photo_get_file_metadata events can change any of the above cases (except the last one). */ |