From: Daniel Kesselberg <mail@danielkesselberg.de>
Date: Sun, 21 Apr 2019 19:55:50 +0000 (+0200)
Subject: Fix setupcheck for intl module
X-Git-Tag: v16.0.1RC1~23^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=790a755232036d877b657b8083373a75c19ad123;p=nextcloud-server.git

Fix setupcheck for intl module

A polyfill for intl is loaded very early (somewhere in base). Polyfill defines grapheme_strlen as function if
intl extension is not loaded. The check here is always true
because there is a function with that name.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
---

diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php
index 5f355d0ec2f..f1da8406edb 100644
--- a/settings/Controller/CheckSetupController.php
+++ b/settings/Controller/CheckSetupController.php
@@ -574,7 +574,7 @@ Raw output
 	protected function hasRecommendedPHPModules(): array {
 		$recommendedPHPModules = [];
 
-		if (!function_exists('grapheme_strlen')) {
+		if (!extension_loaded('intl')) {
 			$recommendedPHPModules[] = 'intl';
 		}