diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2019-02-28 22:39:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 22:39:35 +0100 |
| commit | 48804619c99660a0c2485c658d4514a34c2501ea (patch) | |
| tree | 0b2e998c1f609ef8f00c3eca3cf091cc9ea8d4e4 /settings | |
| parent | fb48abc35ab9d36c6d9eef5fa0ac1fe92bba0f73 (diff) | |
| parent | 6c7ccbecbf6af5037a6c7bf2046bbf4d3bf91e2f (diff) | |
| download | nextcloud-server-48804619c99660a0c2485c658d4514a34c2501ea.tar.gz nextcloud-server-48804619c99660a0c2485c658d4514a34c2501ea.zip | |
Merge pull request #14398 from nextcloud/feature/14394/add-setup-check-for-mysql-utf8mb4
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 920bf59ea55..ba84762196c 100644 --- a/settings/Controller/CheckSetupController.php +++ b/settings/Controller/CheckSetupController.php @@ -591,6 +591,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 = [ @@ -664,6 +668,7 @@ Raw output 'appDirsWithDifferentOwner' => $this->getAppDirsWithDifferentOwner(), 'recommendedPHPModules' => $this->hasRecommendedPHPModules(), 'pendingBigIntConversionColumns' => $this->hasBigIntConversionPendingColumns(), + 'isMysqlUsedWithoutUTF8MB4' => $this->isMysqlUsedWithoutUTF8MB4(), ] ); } |