diff options
| -rw-r--r-- | lib/private/image.php | 5 | ||||
| -rw-r--r-- | tests/lib/image.php | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/private/image.php b/lib/private/image.php index 317b6fde160..2484aeecc63 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -283,9 +283,12 @@ class OC_Image { } /** - * @return string Returns the raw image data. + * @return null|string Returns the raw image data. */ function data() { + if (!$this->valid()) { + return null; + } ob_start(); switch ($this->mimeType) { case "image/png": diff --git a/tests/lib/image.php b/tests/lib/image.php index e0009b9710e..0ee517100ad 100644 --- a/tests/lib/image.php +++ b/tests/lib/image.php @@ -144,6 +144,11 @@ class Test_Image extends \Test\TestCase { $this->assertEquals($expected, $img->data()); } + public function testDataNoResource() { + $img = new \OC_Image(); + $this->assertNull($img->data()); + } + /** * @depends testData */ |