Revert "Also include *.config.php files"
This commit is contained in:
parent
5587899a46
commit
76d6a565f1
31
index.php
31
index.php
|
@ -79,36 +79,17 @@ class Updater {
|
|||
$this->baseDir = $baseDir;
|
||||
|
||||
if ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
|
||||
$configDir = rtrim($dir, '/');
|
||||
$configFileName = rtrim($dir, '/') . '/config.php';
|
||||
} else {
|
||||
$configDir = $this->baseDir . '/../config';
|
||||
$configFileName = $this->baseDir . '/../config/config.php';
|
||||
}
|
||||
|
||||
$configFiles = [$configDir . '/config.php'];
|
||||
|
||||
if (!file_exists($configFiles[0])) {
|
||||
if (!file_exists($configFileName)) {
|
||||
throw new \Exception('Could not find config.php. Is this file in the "updater" subfolder of Nextcloud?');
|
||||
}
|
||||
|
||||
$extraConfigFiles = glob($configDir . '/*.config.php');
|
||||
if (is_array($extraConfigFiles)) {
|
||||
natsort($extraConfigFiles);
|
||||
$configFiles = array_merge($configFiles, $extraConfigFiles);
|
||||
}
|
||||
|
||||
foreach ($configFiles as $configFile) {
|
||||
/**
|
||||
* @psalm-suppress UnresolvableInclude
|
||||
* @var mixed $CONFIG
|
||||
*/
|
||||
require_once $configFile;
|
||||
|
||||
if (isset($CONFIG) && is_array($CONFIG)) {
|
||||
$this->configValues = array_merge($this->configValues, $CONFIG);
|
||||
}
|
||||
|
||||
unset($CONFIG);
|
||||
}
|
||||
/** @var array $CONFIG */
|
||||
require_once $configFileName;
|
||||
$this->configValues = $CONFIG;
|
||||
|
||||
if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) {
|
||||
// updater disabled
|
||||
|
|
|
@ -41,36 +41,17 @@ class Updater {
|
|||
$this->baseDir = $baseDir;
|
||||
|
||||
if ($dir = getenv('NEXTCLOUD_CONFIG_DIR')) {
|
||||
$configDir = rtrim($dir, '/');
|
||||
$configFileName = rtrim($dir, '/') . '/config.php';
|
||||
} else {
|
||||
$configDir = $this->baseDir . '/../config';
|
||||
$configFileName = $this->baseDir . '/../config/config.php';
|
||||
}
|
||||
|
||||
$configFiles = [$configDir . '/config.php'];
|
||||
|
||||
if (!file_exists($configFiles[0])) {
|
||||
if (!file_exists($configFileName)) {
|
||||
throw new \Exception('Could not find config.php. Is this file in the "updater" subfolder of Nextcloud?');
|
||||
}
|
||||
|
||||
$extraConfigFiles = glob($configDir . '/*.config.php');
|
||||
if (is_array($extraConfigFiles)) {
|
||||
natsort($extraConfigFiles);
|
||||
$configFiles = array_merge($configFiles, $extraConfigFiles);
|
||||
}
|
||||
|
||||
foreach ($configFiles as $configFile) {
|
||||
/**
|
||||
* @psalm-suppress UnresolvableInclude
|
||||
* @var mixed $CONFIG
|
||||
*/
|
||||
require_once $configFile;
|
||||
|
||||
if (isset($CONFIG) && is_array($CONFIG)) {
|
||||
$this->configValues = array_merge($this->configValues, $CONFIG);
|
||||
}
|
||||
|
||||
unset($CONFIG);
|
||||
}
|
||||
/** @var array $CONFIG */
|
||||
require_once $configFileName;
|
||||
$this->configValues = $CONFIG;
|
||||
|
||||
if (php_sapi_name() !== 'cli' && ($this->configValues['upgrade.disable-web'] ?? false)) {
|
||||
// updater disabled
|
||||
|
|
BIN
updater.phar
BIN
updater.phar
Binary file not shown.
Loading…
Reference in New Issue