Contacts: Better checks for GD library.

diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
index 6fe68cefb6d0ce4dd5894160ac2b4f1e6e05adef..729c2dfbcfd285f284072a6a2168b569772e5da4 100755 (executable)
--- 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 11d1db03108bfc2ed4d8efd3f476794ba2735fe2..5b340042a2503dc91a3b668a26c868a331d3e2b5 100755 (executable)
--- 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();