From 01eb5d2790638ab836adc95a9726b6a1003562b9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 2 Dec 2012 03:43:51 +0100
Subject: fix some edge cases while scanning the root of a storage

---
 lib/files/cache/scanner.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

diff --git a/lib/files/cache/scanner.php b/lib/files/cache/scanner.php
index 9ee509bb132..4c0ec9617f9 100644
--- a/lib/files/cache/scanner.php
+++ b/lib/files/cache/scanner.php
@@ -71,7 +71,7 @@ class Scanner {
 		\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
 		$data = $this->getData($file);
 		if ($data) {
-			if ($file !== '') {
+			if ($file) {
 				$parent = dirname($file);
 				if ($parent === '.') {
 					$parent = '';
@@ -101,7 +101,7 @@ class Scanner {
 		if ($dh = $this->storage->opendir($path)) {
 			while ($file = readdir($dh)) {
 				if ($file !== '.' and $file !== '..') {
-					$child = ($path !== '') ? $path . '/' . $file : $file;
+					$child = ($path) ? $path . '/' . $file : $file;
 					$data = $this->scanFile($child);
 					if ($data) {
 						if ($data['mimetype'] === 'httpd/unix-directory') {
-- 
cgit v1.2.3