[Pkg-owncloud-commits] [owncloud] 31/258: Backport issue 10764

David Prévot taffit at moszumanska.debian.org
Sat Oct 11 17:22:17 UTC 2014


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 7bd4f6cac59b73cb7c14c057d6ee66d04c5c1a28
Author: Jesus Macias <jmacias at full-on-net.com>
Date:   Fri Sep 5 13:23:09 2014 +0200

    Backport issue 10764
---
 lib/private/files/view.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 44e44ad..baf765d 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -304,7 +304,13 @@ class View {
 			$hooks[] = 'write';
 		}
 		$result = $this->basicOperation('touch', $path, $hooks, $mtime);
-		if (!$result) { //if native touch fails, we emulate it by changing the mtime in the cache
+		if (!$result) {
+			// If create file fails because of permissions on external storage like SMB folders,
+			// check file exists and return false if not.
+			if(!$this->file_exists($path)){
+				return false;
+			}
+			//if native touch fails, we emulate it by changing the mtime in the cache
 			$this->putFileInfo($path, array('mtime' => $mtime));
 		}
 		return true;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git



More information about the Pkg-owncloud-commits mailing list