diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2014-12-18 15:36:18 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2014-12-18 15:36:18 +0100 |
| commit | 4b1b93507df4f7c9e0792c0de330ca358d9d38e0 (patch) | |
| tree | 148f52000caed6429533a822410ef5bcf0ac67fd | |
| parent | 10a0fc2856bfa68ff04a42f141829a6e66a9b2da (diff) | |
| download | nextcloud-server-4b1b93507df4f7c9e0792c0de330ca358d9d38e0.tar.gz nextcloud-server-4b1b93507df4f7c9e0792c0de330ca358d9d38e0.zip | |
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.
| -rw-r--r-- | apps/files/ajax/list.php | 1 | ||||
| -rw-r--r-- | apps/files/lib/helper.php | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php index 4abf5ad7607..4aed79d70f7 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 7adca3ffa6d..4a8af59475b 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); } |