From 473d1fb756b8368d34da7ce14ceaa863ab836074 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Mon, 17 Dec 2018 17:08:12 +0100 Subject: [PATCH] Fix 2.5 merge error --- setup/setuputils.class.inc.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/setup/setuputils.class.inc.php b/setup/setuputils.class.inc.php index 8ac9036fb..f8c21a615 100644 --- a/setup/setuputils.class.inc.php +++ b/setup/setuputils.class.inc.php @@ -107,10 +107,15 @@ class SetupUtils 'gd', // used to test image type (always returns false if not installed), image resizing, PDF export ); $aOptionalExtensions = array( - 'sodium' => 'Strong encryption will not be used.', - 'openssl' => 'Strong encryption will not be used.',), + 'mcrypt, sodium or openssl' => + array( + 'mcrypt' => 'Strong encryption will not be used.', + 'sodium' => 'Strong encryption will not be used.', + 'openssl' => 'Strong encryption will not be used.', + ), 'ldap' => 'LDAP authentication will be disabled.', ); + asort($aMandatoryExtensions); // Sort the list to look clean ! ksort($aOptionalExtensions); // Sort the list to look clean ! $aExtensionsOk = array();