diff options
author | Josh Richards <josh.t.richards@gmail.com> | 2024-05-09 11:45:16 -0400 |
---|---|---|
committer | Josh Richards <josh.t.richards@gmail.com> | 2024-05-09 11:45:16 -0400 |
commit | c0e395cc0d3c95e365e7e6623fc23ddb53de8032 (patch) | |
tree | c4761c3ed669df2158914c80d15fdfdafd8765eb /apps | |
parent | 4e7b62a1e1e1285134dfa5c45565a39f588fe3fc (diff) | |
download | nextcloud-server-c0e395cc0d3c95e365e7e6623fc23ddb53de8032.tar.gz nextcloud-server-c0e395cc0d3c95e365e7e6623fc23ddb53de8032.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.php | 9 |
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".') ); } } |