Merge pull request #12868 from nextcloud/backport/12857/stable15

MorrisJobke · web-flow · commit 1e906fd15c05 · 2018-12-06T01:18:21.000+01:00
[stable15] Emit write update only once on touch
diff --git a/lib/private/Files/View.php b/lib/private/Files/View.php
@@ -1157,7 +1157,7 @@ private function basicOperation($operation, $path, $hooks = [], $extraParam = nu
 				if ($result && in_array('delete', $hooks) and $result) {
 					$this->removeUpdate($storage, $internalPath);
 				}
-				if ($result && in_array('write', $hooks) and $operation !== 'fopen') {
+				if ($result && in_array('write', $hooks,  true) && $operation !== 'fopen' && $operation !== 'touch') {
 					$this->writeUpdate($storage, $internalPath);
 				}
 				if ($result && in_array('touch', $hooks)) {

Original file line number	Diff line number	Diff line change
`@@ -1157,7 +1157,7 @@ private function basicOperation($operation, $path, $hooks = [], $extraParam = nu`
`1157`	`1157`	`if ($result && in_array('delete', $hooks) and $result) {`
`1158`	`1158`	`$this->removeUpdate($storage, $internalPath);`
`1159`	`1159`	`}`
`1160`		`- if ($result && in_array('write', $hooks) and $operation !== 'fopen') {`
	`1160`	`+ if ($result && in_array('write', $hooks, true) && $operation !== 'fopen' && $operation !== 'touch') {`
`1161`	`1161`	`$this->writeUpdate($storage, $internalPath);`
`1162`	`1162`	`}`
`1163`	`1163`	`if ($result && in_array('touch', $hooks)) {`