mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21671 from owncloud/fix-setup-on-master 

Use legacy method when ownCloud is not yet installed
This commit is contained in:
Thomas Müller 2016-01-13 10:29:36 +01:00
parent e22186d234 28049b510b
commit 4129480eb0
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/http/client/client.php
View File

@ -62,7 +62,14 @@ class Client implements IClient {
if ($this->certificateManager->listCertificates() !== []) {
$this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath());
} else {
$this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null));
// If the instance is not yet setup we need to use the static path as
// $this->certificateManager->getAbsoluteBundlePath() tries to instantiiate
// a view
if($this->config->getSystemValue('installed', false)) {
$this->client->setDefaultOption('verify', $this->certificateManager->getAbsoluteBundlePath(null));
} else {
$this->client->setDefaultOption('verify', \OC::$SERVERROOT . '/resources/config/ca-bundle.crt');
}
}
$this->client->setDefaultOption('headers/User-Agent', 'ownCloud Server Crawler');