backwards compatibility

Signed-off-by: Melvin mngmt-02 <melvin@suter.dev>
Signed-off-by: Melvin Suter <github@suter.dev>
pull/2084/head
Melvin mngmt-02 3 years ago committed by Melvin Suter
parent a16b4f71cc
commit d13714b973

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

@ -1,7 +1,11 @@
<?php
if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
// Get originaly configured values
include(__DIR__.'/config.php');
// Add environment variables
$CONFIG = array(
'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
);
}

Loading…
Cancel
Save