always check the mtime of the system bundle and additionally the user specific certificate bundle if a user is given

schiessle · schiessle · commit c493791b299b · 2016-07-08T18:12:39.000+02:00
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) {

Original file line number	Diff line number	Diff line change
`@@ -238,8 +238,12 @@ private function needsRebundling($uid = '') {`
`238`	`238`	`if (!$this->view->file_exists($targetBundle)) {`
`239`	`239`	`return true;`
`240`	`240`	`}`
`241`		`- if (!is_null($uid)) { // also depend on the system bundle`
`242`		`- $sourceBundles[] = $this->view->filemtime($this->getCertificateBundle(null));`
	`241`	`+`
	`242`	`+ // also depend on the system bundle`
	`243`	`+ $sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle(null));`
	`244`	`+`
	`245`	`+ if (!is_null($uid)) { // add the user bundle`
	`246`	`+ $sourceMTimes[] = $this->view->filemtime($this->getCertificateBundle($uid));`
`243`	`247`	`}`
`244`	`248`
`245`	`249`	`$sourceMTime = array_reduce($sourceMTimes, function ($max, $mtime) {`