update kirby
This commit is contained in:
parent
652262ac94
commit
9c662bcbba
165 changed files with 1757 additions and 598 deletions
|
|
@ -153,8 +153,8 @@ class Environment
|
|||
* @param array|null $info Optional override for `$_SERVER`
|
||||
*/
|
||||
public function detect(
|
||||
array $options = null,
|
||||
array $info = null
|
||||
array|null $options = null,
|
||||
array|null $info = null
|
||||
): array {
|
||||
$defaults = [
|
||||
'cli' => null,
|
||||
|
|
@ -178,11 +178,11 @@ class Environment
|
|||
if ($options['allowed'] === '*' || $options['allowed'] === ['*']) {
|
||||
$this->detectAuto(true);
|
||||
|
||||
// fixed environments
|
||||
// fixed environments
|
||||
} elseif (empty($options['allowed']) === false) {
|
||||
$this->detectAllowed($options['allowed']);
|
||||
|
||||
// secure auto-detection
|
||||
// secure auto-detection
|
||||
} else {
|
||||
$this->detectAuto();
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue