Merge pull request #14474 from owncloud/move-utf-8-check-to-setup

Move UTF-8 check to setup

1 files changed, 6 insertions, 9 deletions

diff --git a/lib/private/util.php b/lib/private/util.php
index 68b248f0003..7c4a1173082 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -651,6 +651,7 @@ class OC_Util {
 			'ini' => [
 				'mbstring.func_overload' => 0,
 				'output_buffering' => false,
+				'default_charset' => 'UTF-8',
 			],
 		);
 		$missingDependencies = array();
@@ -684,6 +685,11 @@ class OC_Util {
 					$invalidIniSettings[] = [$setting, $expected];
 				}
 			}
+			if(is_string($expected)) {
+				if(strtolower($iniWrapper->getString($setting)) !== strtolower($expected)) {
+					$invalidIniSettings[] = [$setting, $expected];
+				}
+			}
 		}
 
 		foreach($missingDependencies as $missingDependency) {
@@ -1501,13 +1507,4 @@ class OC_Util {
 		}
 	}
 
-	/**
-	 * Check if PhpCharset config is UTF-8
-	 *
-	 * @return string
-	 */
-	public static function isPhpCharSetUtf8() {
-		return strtoupper(ini_get('default_charset')) === 'UTF-8';
-	}
-
 }