2 files changed, 6 insertions, 1 deletions
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 6fe68cefb6d..729c2dfbcfd 100755
--- a/apps/contacts/photo.php
+++ b/apps/contacts/photo.php
@@ -26,6 +26,11 @@ if(is_null($id)) {
 	getStandardImage();
 }
 
+if(!extension_loaded('gd') || !function_exists('gd_info')) {
+	OCP\Util::writeLog('contacts','photo.php. GD module not installed',OCP\Util::DEBUG);
+	getStandardImage();
+}
+
 $contact = OC_Contacts_App::getContactVCard($id);
 $image = new OC_Image();
 if(!$image) {
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 11d1db03108..5b340042a25 100755
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -32,7 +32,7 @@ function getStandardImage(){
 	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person.png'));
 }
 
-if(!function_exists('imagecreatefromjpeg')) {
+if(!extension_loaded('gd') || !function_exists('gd_info')) {
 	OCP\Util::writeLog('contacts','thumbnail.php. GD module not installed',OCP\Util::DEBUG);
 	getStandardImage();
 	exit();