stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-23 00:04:03 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #133 from shadlaws/followon_1994

Browse Source 
Follow-on to 0312d1b071 for #1994.
This commit is contained in:
Bharat Mediratta
2013-02-14 11:18:45 -08:00
parent e5ed05004f 27be4ae606
commit 6c861a014d
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gallery/helpers/movie.php
+1 -3
View File
@@ -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).
*/
modules/gallery/helpers/photo.php
+2 -4
View File
@@ -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).
*/