summaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2016-07-11 11:04:49 +0200
committerGitHub <noreply@github.com>2016-07-11 11:04:49 +0200
commit103417fd9caae7f8c834f920b69fde54339d82fd (patch)
treed66601c9f07ccc2927efdb525b04ee5a40631afa /lib/private
parent92f7722b4398ec37a3b1a51a10e0325b547885a7 (diff)
parent49cad153afb7dedc70842f9df575f3cb1f41ff27 (diff)
downloadnextcloud-server-103417fd9caae7f8c834f920b69fde54339d82fd.tar.gz
nextcloud-server-103417fd9caae7f8c834f920b69fde54339d82fd.zip
Merge pull request #350 from nextcloud/fix-check-certificate-bundles
fix check if the certificate bundle needs to be updated
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/Security/CertificateManager.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Security/CertificateManager.php b/lib/private/Security/CertificateManager.php
index befdcb6b85b..77d0c844b8c 100644
--- a/lib/private/Security/CertificateManager.php
+++ b/lib/private/Security/CertificateManager.php
@@ -238,8 +238,9 @@ class CertificateManager implements ICertificateManager {
if (!$this->view->file_exists($targetBundle)) {
return true;
}
+
if (!is_null($uid)) { // also depend on the system bundle
- $sourceBundles[] = $this->view->filemtime($this->getCertificateBundle(null));
+ $sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null));
}
$sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) {