From f55aaad858396484d35f87ca09e5f53e9848ddf6 Mon Sep 17 00:00:00 2001
From: Florin Peter <fp@datawerk.de>
Date: Mon, 29 Apr 2013 15:43:48 +0200
Subject: fix for infinite loop causing on files_encryption branch when testing
 "apps/files_encryption/test/crypt.php" on Method
 testSymmetricStreamEncryptShortFileContent

---
 lib/files/cache/scanner.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/files/cache/scanner.php')

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index f019d4fc608..5241acec1ee 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -68,7 +68,7 @@ class Scanner {
 			if ($data) {
 				if ($file) {
 					$parent = dirname($file);
-					if ($parent === '.') {
+					if ($parent === '.' or $parent === '/') {
 						$parent = '';
 					}
 					if (!$this->cache->inCache($parent)) {
-- 
cgit v1.2.3