diff options
| author | Git'Fellow <12234510+solracsf@users.noreply.github.com> | 2023-05-04 22:35:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-04 22:35:31 +0200 |
| commit | 22f02a46d1b16793b9f7498d939221284afa83df (patch) | |
| tree | aefd2c2864c985e54693eccb4302fe06cdc9f42c | |
| parent | 364f3f5f26056fac82fb7f249852341fa69d2630 (diff) | |
| download | nextcloud-server-22f02a46d1b16793b9f7498d939221284afa83df.tar.gz nextcloud-server-22f02a46d1b16793b9f7498d939221284afa83df.zip | |
Fix conflicts
Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com>
| -rw-r--r-- | lib/private/Security/CertificateManager.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/private/Security/CertificateManager.php b/lib/private/Security/CertificateManager.php index f22a06641de..6231534205a 100644 --- a/lib/private/Security/CertificateManager.php +++ b/lib/private/Security/CertificateManager.php @@ -251,7 +251,12 @@ class CertificateManager implements ICertificateManager { $this->createCertificateBundle(); } - $this->bundlePath = $this->view->getLocalFile($this->getCertificateBundle()); + $certificateBundle = $this->getCertificateBundle(); + $this->bundlePath = $this->view->getLocalFile($certificateBundle) ?: null; + + if ($this->bundlePath === null) { + throw new \RuntimeException('Unable to get certificate bundle "' . $certificateBundle . '".'); + } } return $this->bundlePath; } catch (\Exception $e) { |