From: Alan H. <min...@us...> - 2005-05-14 05:31:23
|
Update of /cvsroot/gallery/gallery2/modules/core/classes/helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19621/modules/core/classes/helpers Modified Files: GalleryItemHelper_medium.class Log Message: adjusted create-viewable-preferred deriv code in addExistingItemToAlbum so it only runs for image/* mime types.. now we won't convert movies or pdfs to jpeg and be unable to see those original files. Index: GalleryItemHelper_medium.class =================================================================== RCS file: /cvsroot/gallery/gallery2/modules/core/classes/helpers/GalleryItemHelper_medium.class,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- GalleryItemHelper_medium.class 9 May 2005 06:22:26 -0000 1.60 +++ GalleryItemHelper_medium.class 14 May 2005 05:31:14 -0000 1.61 @@ -312,11 +312,11 @@ $mimeType = $source->getMimeType(); /* Make the file type viewable, if we need to. */ - list ($ret, $isViewable) = GalleryCoreApi::isViewableMimeType($source->getMimeType()); + list ($ret, $isViewable) = GalleryCoreApi::isViewableMimeType($mimeType); if ($ret->isError()) { return $ret->wrap(__FILE__, __LINE__); } - if (!$isViewable) { + if (!$isViewable && !strncmp($mimeType, 'image/', 6)) { if (GalleryUtilities::isA($source, 'GalleryDerivative')) { $operations = $source->getDerivativeOperations(); } else { @@ -324,7 +324,7 @@ } list ($ret, $newOperations, $outputMimeType) = GalleryCoreApi::makeSupportedViewableOperationSequence( - $source->getMimeType(), $operations, false); + $mimeType, $operations, false); if ($ret->isError()) { return $ret->wrap(__FILE__, __LINE__); } @@ -336,7 +336,7 @@ * update it to use these operations. */ if (GalleryUtilities::isA($source, 'GalleryItem')) { - /* No preferred. Create one */ + /* No preferred. Create one */ list ($ret, $preferred) = GalleryCoreApi::newFactoryInstanceByHint( 'GalleryDerivative', $item->getEntityType()); if ($ret->isError()) { |