diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-03-26 19:20:38 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-26 19:20:38 +0300 |
| commit | 087fa7f3952037a3be1ed59a2038ed1ba64be5db (patch) | |
| tree | 0321275e2dcd6431eb19f43fdf0c8a427ec7b079 /settings | |
| parent | be8a82ecbae7a730c936daf847f089ea065d3d5d (diff) | |
| parent | 31fb0896a0881c34fa4d3989248e42d3bb806ab5 (diff) | |
Merge pull request #14857 from nextcloud/backport/14398/stable15
[stable15] Add setup check for missing UTF8MB4 on mysql
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/Controller/CheckSetupController.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/settings/Controller/CheckSetupController.php b/settings/Controller/CheckSetupController.php index 92c2b1b47db..b86f25a7fea 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -605,6 +605,10 @@ Raw output return $recommendedPHPModules; } + protected function isMysqlUsedWithoutUTF8MB4(): bool { + return ($this->config->getSystemValue('dbtype', 'sqlite') === 'mysql') && ($this->config->getSystemValue('mysql.utf8mb4', false) === false); + } + protected function hasBigIntConversionPendingColumns(): array { // copy of ConvertFilecacheBigInt::getColumnsByTable() $tables = [ @@ -679,6 +683,7 @@ Raw output 'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(), 'recommendedPHPModules' => $this->hasRecommendedPHPModules(), 'pendingBigIntConversionColumns' => $this->hasBigIntConversionPendingColumns(), + 'isMysqlUsedWithoutUTF8MB4' => $this->isMysqlUsedWithoutUTF8MB4(), ] ); } |