aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorJosh Richards <josh.t.richards@gmail.com>2024-05-09 11:45:16 -0400
committerbackportbot[bot] <backportbot[bot]@users.noreply.github.com>2024-05-13 09:55:37 +0000
commit00b22f6c1140afb52fe2e208ae0241bbf78d022a (patch)
treeb8441b01e2c0ed64da83728031a2d2a730097e79 /apps
parent3439acd64d6e77e451f69ea8e82a8807df4471f9 (diff)
downloadnextcloud-server-00b22f6c1140afb52fe2e208ae0241bbf78d022a.tar.gz
nextcloud-server-00b22f6c1140afb52fe2e208ae0241bbf78d022a.zip
fix(setupCheck): Only warn when memcache present w/o memcached
Signed-off-by: Josh Richards <josh.t.richards@gmail.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/settings/lib/SetupChecks/MemcacheConfigured.php9
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/settings/lib/SetupChecks/MemcacheConfigured.php b/apps/settings/lib/SetupChecks/MemcacheConfigured.php
index 1afe9cb879c..98192f6289e 100644
--- a/apps/settings/lib/SetupChecks/MemcacheConfigured.php
+++ b/apps/settings/lib/SetupChecks/MemcacheConfigured.php
@@ -53,15 +53,16 @@ class MemcacheConfigured implements ISetupCheck {
$memcacheLocalClass = $this->config->getSystemValue('memcache.local', null);
$caches = array_filter([$memcacheDistributedClass,$memcacheLockingClass,$memcacheLocalClass]);
if (in_array(\OC\Memcache\Memcached::class, array_map(fn (string $class) => ltrim($class, '\\'), $caches))) {
- if (extension_loaded('memcache')) {
+ // wrong PHP module is installed
+ if (extension_loaded('memcache') && !extension_loaded('memcached')) {
return SetupResult::warning(
- $this->l10n->t('Memcached is configured as distributed cache, but the wrong PHP module "memcache" is installed. \\OC\\Memcache\\Memcached only supports "memcached" and not "memcache".'),
- 'https://code.google.com/p/memcached/wiki/PHPClientComparison'
+ $this->l10n->t('Memcached is configured as distributed cache, but the wrong PHP module ("memcache") is installed. Please install the PHP module "memcached".')
);
}
+ // required PHP module is missing
if (!extension_loaded('memcached')) {
return SetupResult::warning(
- $this->l10n->t('Memcached is configured as distributed cache, but the PHP module "memcached" is not installed.')
+ $this->l10n->t('Memcached is configured as distributed cache, but the PHP module "memcached" is not installed. Please install the PHP module "memcached".')
);
}
}