always check the mtime of the system bundle and additionally the user…

… specific certificate bundle if a user is given
nextcloud · Jul 8, 2016 · c493791 · c493791
1 parent a84250e
commit c493791
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/lib/private/Security/CertificateManager.php b/lib/private/Security/CertificateManager.php
@@ -238,8 +238,12 @@ private function needsRebundling($uid = '') {
 		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));
+
+		// also depend on the system bundle
+		$sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null));
+
+		if (!is_null($uid)) { // add the user bundle
+			$sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle($uid));
 		}
 
 		$sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) {