summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2015-02-16 10:26:56 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2015-02-16 10:26:56 +0100
commitd5ca5c7bcc922f2677847d97813722073e6192bf (patch)
treeae3ec68d0fc82b4f56f42799ccd491bd2348f4f2 /lib/private
parent786ff6a5a323e2efe54aa6b736c3fbdf12813d79 (diff)
parenta496c34aea411153a3e353c255fca3bcf593553a (diff)
downloadnextcloud-server-d5ca5c7bcc922f2677847d97813722073e6192bf.tar.gz
nextcloud-server-d5ca5c7bcc922f2677847d97813722073e6192bf.zip
Merge pull request #14138 from owncloud/fix-image-flip-php53
Don't flip image in PHP 5.4
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/image.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/image.php b/lib/private/image.php
index f5f9a04facc..317b6fde160 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -391,7 +391,7 @@ class OC_Image {
$rotate = 90;
break;
}
- if($flip) {
+ if($flip && function_exists('imageflip')) {
imageflip($this->resource, IMG_FLIP_HORIZONTAL);
}
if ($rotate) {