From 4b1b93507df4f7c9e0792c0de330ca358d9d38e0 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 18 Dec 2014 15:36:18 +0100 Subject: [PATCH] Only populate tags in main file list Moved populateTags to be done on the main file list. This prevents the public file list to go through the same code and cause an error when there is no user. --- apps/files/ajax/list.php | 1 + apps/files/lib/helper.php | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 4abf5ad760..4aed79d70f 100644 --- a/apps/files/ajax/list.php +++ b/apps/files/ajax/list.php @@ -26,6 +26,7 @@ try { // make filelist $files = \OCA\Files\Helper::getFiles($dir, $sortAttribute, $sortDirection); + $files = \OCA\Files\Helper::populateTags($files); $data['directory'] = $dir; $data['files'] = \OCA\Files\Helper::formatFileInfos($files); $data['permissions'] = $permissions; diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 7adca3ffa6..4a8af59475 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -174,7 +174,6 @@ class Helper */ public static function getFiles($dir, $sortAttribute = 'name', $sortDescending = false) { $content = \OC\Files\Filesystem::getDirectoryContent($dir); - $content = self::populateTags($content); return self::sortFiles($content, $sortAttribute, $sortDescending); }