[Pkg-owncloud-commits] [owncloud] 15/90: Do not remove dir entry if it has the same name as the parent

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 72c0cc22671f2ce94c8f7aad1f496db289ca342e
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Nov 13 17:37:56 2014 +0100

    Do not remove dir entry if it has the same name as the parent
    
    This fixes an issue when a subdir has the same name as its parent, it
    would get exluded from the list.
---
 apps/files_external/lib/amazons3.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index a3fe183..bc1b56f 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -266,10 +266,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				$file = basename(
 					isset($object['Key']) ? $object['Key'] : $object['Prefix']
 				);
-
-				if ($file != basename($path)) {
-					$files[] = $file;
-				}
+				$files[] = $file;
 			}
 
 			\OC\Files\Stream\Dir::register('amazons3' . $path, $files);

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