From: Morris Jobke Date: Tue, 2 Dec 2014 15:18:00 +0000 (+0100) Subject: Merge pull request #11975 from owncloud/Combustible-combustible_dev X-Git-Tag: v8.0.0alpha1~199 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a16d1a85efe1f8404a94513216c50f5f752e77c0;p=nextcloud-server.git Merge pull request #11975 from owncloud/Combustible-combustible_dev Check imagecreate*() return before using and use logger in \OC_Image --- a16d1a85efe1f8404a94513216c50f5f752e77c0