|
|
@ -113,6 +113,7 @@ class Config
|
|
|
|
if (in_array($key, array('github-oauth', 'http-basic')) && isset($this->config[$key])) {
|
|
|
|
if (in_array($key, array('github-oauth', 'http-basic')) && isset($this->config[$key])) {
|
|
|
|
$this->config[$key] = array_merge($this->config[$key], $val);
|
|
|
|
$this->config[$key] = array_merge($this->config[$key], $val);
|
|
|
|
} elseif ('preferred-install' === $key && isset($this->config[$key])) {
|
|
|
|
} elseif ('preferred-install' === $key && isset($this->config[$key])) {
|
|
|
|
|
|
|
|
if (is_array($val) || is_array($this->config[$key])) {
|
|
|
|
if (is_string($val)) {
|
|
|
|
if (is_string($val)) {
|
|
|
|
$val = array('*' => $val);
|
|
|
|
$val = array('*' => $val);
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -129,6 +130,9 @@ class Config
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
$this->config[$key] = $val;
|
|
|
|
$this->config[$key] = $val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
$this->config[$key] = $val;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|