sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #32278 from nextcloud/remove-default-php

pull/32349/head
John Molakvoæ 2022-05-12 10:05:46 +07:00 committed by GitHub
parent e11c5f21cf f110ff9f4d
commit be49f79503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/base.php
Unescape Escape View File

@ -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, '/') . '/';
@ -462,14 +462,6 @@ class OC {
return \OC::$server->getConfig()->getSystemValue('session_lifetime', 60 * 60 * 24);
}
/**
* 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
*/
@ -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);