arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'v2.5' of https://github.com/electerious/Lychee into v2.5

Browse Source
This commit is contained in:
Tobias Reich 2014-04-11 09:49:05 +02:00
commit 2a18188592
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
php/modules/upload.php
View File

@ -69,7 +69,7 @@ function upload($files, $albumID, $description = '', $tags = '') {
// Set orientation based on EXIF data // Set orientation based on EXIF data
if ($file['type'] === 'image/jpeg' && isset($info['orientation']) && isset($info['width']) && isset($info['height'])) { if ($file['type'] === 'image/jpeg' && isset($info['orientation']) && isset($info['width']) && isset($info['height'])) {
if(class_exists('Imagick')) { if(extension_loaded('imagick')) {
$rotateImage = 0; $rotateImage = 0;
@ -306,7 +306,7 @@ function createThumb($filename, $width = 200, $height = 200) {
$newUrl2x = __DIR__ . '/../../uploads/thumb/' . $photoName[0] . '@2x.jpeg'; $newUrl2x = __DIR__ . '/../../uploads/thumb/' . $photoName[0] . '@2x.jpeg';
// create thumbnails with Imagick // create thumbnails with Imagick
if (class_exists('Imagick')) { if(extension_loaded('imagick')) {
// read image // read image
$thumb = new Imagick(); $thumb = new Imagick();