diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-22 01:22:36 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-22 01:26:35 +0200 |
| commit | 28d72b822deadd9d4e510eefd3a0f76ebdf236ec (patch) | |
| tree | c1bf37663599006776656e618475370a3578c3b1 /lib/files/view.php | |
| parent | afbfa742d7848089523262f5c234035db1b20d3b (diff) | |
| parent | e2444ec9c5a7c36f7cfaa200387fb8d16e5dedb1 (diff) | |
| download | nextcloud-server-28d72b822deadd9d4e510eefd3a0f76ebdf236ec.tar.gz nextcloud-server-28d72b822deadd9d4e510eefd3a0f76ebdf236ec.zip | |
Merge branch 'master' into files_encryption
Conflicts:
lib/files/cache/cache.php
Diffstat (limited to 'lib/files/view.php')
| -rw-r--r-- | lib/files/view.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/files/view.php b/lib/files/view.php index bfe7c89b509..a60ab61e8ba 100644 --- a/lib/files/view.php +++ b/lib/files/view.php @@ -251,8 +251,11 @@ class View { if (!$this->file_exists($path)) { $hooks[] = 'write'; } - - return $this->basicOperation('touch', $path, $hooks, $mtime); + $result = $this->basicOperation('touch', $path, $hooks, $mtime); + if (!$result) { //if native touch fails, we emulate it by changing the mtime in the cache + $this->putFileInfo($path, array('mtime' => $mtime)); + } + return true; } public function file_get_contents($path) { |