From f51145572aaccf24e8d793e24ff82e5393de2c81 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 14 Dec 2015 04:32:26 -0500
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail

---
 program/steps/addressbook/photo.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/program/steps/addressbook/photo.inc b/program/steps/addressbook/photo.inc
index 389edc9..1d3d950 100644
--- a/program/steps/addressbook/photo.inc
+++ b/program/steps/addressbook/photo.inc
@@ -89,6 +89,9 @@
     header('Content-Type: ' . rcube_mime::image_content_type($data));
     echo $data;
 }
+else if (!empty($_GET['_error'])) {
+    header('HTTP/1.0 404 Photo not found');
+}
 else {
     header('Content-Type: image/gif');
     echo base64_decode(rcmail_output::BLANK_GIF);

--
Gitblit v1.9.1