Merge branch 'Philippe23-make-qrcode-optional'

program/steps/addressbook/show.inc

@@ -42,8 +42,8 @@ if ($cid && ($record = ($CONTACT_RECORD ?: $CONTACTS->get_record($cid, true))))
 // get address book name (for display)
 rcmail_set_sourcename($CONTACTS);
 
-// Disable qr-code if php-gd is not installed
+// Disable qr-code if php-gd or Endroid's QrCode is not installed
-$OUTPUT->set_env('qrcode', function_exists('imagecreate'));
+$OUTPUT->set_env('qrcode', function_exists('imagecreate') && class_exists('Endroid\QrCode\QrCode'));
 $OUTPUT->add_label('qrcode');
 
 $OUTPUT->add_handlers(array(