Merge pull request #11975 from owncloud/Combustible-combustible_dev

Browse source

Check imagecreate*() return before using and use logger in \OC_Image

...

This commit is contained in:

Morris Jobke 2014-12-02 16:18:00 +01:00

parent e9029f94cb b2175f0e25

commit a16d1a85ef

1 changed files with 267 additions and 254 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

521

lib/private/image.php

View file

File diff suppressed because it is too large Load diff