diff options
| author | Git'Fellow <carlos@reendex.com> | 2022-05-05 13:46:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 13:46:09 +0200 |
| commit | f110ff9f4d54c4124483f3ba0e6c681362b79a50 (patch) | |
| tree | a2055046b2b2a85d0a86b7d9a22c6464958140ad /lib/base.php | |
| parent | d3efd40a24be45a2a38a904c111d10fa4de01f81 (diff) | |
| download | nextcloud-server-f110ff9f4d54c4124483f3ba0e6c681362b79a50.tar.gz nextcloud-server-f110ff9f4d54c4124483f3ba0e6c681362b79a50.zip | |
Remove default values
These values are already the default on supported PHP versions.
I suggest to remove these calls.
Diffstat (limited to 'lib/base.php')
| -rw-r--r-- | lib/base.php | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/base.php b/lib/base.php index 21889272dd7..8cf5360b084 100644 --- a/lib/base.php +++ b/lib/base.php @@ -141,7 +141,7 @@ class OC { public static function initPaths() { if (defined('PHPUNIT_CONFIG_DIR')) { self::$configDir = OC::$SERVERROOT . '/' . PHPUNIT_CONFIG_DIR . '/'; - } elseif (defined('PHPUNIT_RUN') and PHPUNIT_RUN and is_dir(OC::$SERVERROOT . '/tests/config/')) { + } elseif (defined('PHPUNIT_RUN') && PHPUNIT_RUN && is_dir(OC::$SERVERROOT . '/tests/config/')) { self::$configDir = OC::$SERVERROOT . '/tests/config/'; } elseif ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) { self::$configDir = rtrim($dir, '/') . '/'; @@ -463,14 +463,6 @@ class OC { } /** - * Try to set some values to the required Nextcloud default - */ - public static function setRequiredIniValues() { - @ini_set('default_charset', 'UTF-8'); - @ini_set('gd.jpeg_ignore_warning', '1'); - } - - /** * Send the same site cookies */ private static function sendSameSiteCookies() { @@ -634,7 +626,6 @@ class OC { @ini_set('max_execution_time', '3600'); @ini_set('max_input_time', '3600'); - self::setRequiredIniValues(); self::handleAuthHeaders(); $systemConfig = \OC::$server->get(\OC\SystemConfig::class); self::registerAutoloaderCache($systemConfig); |