diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-12-19 12:48:20 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-12-19 12:48:20 +0100 |
| commit | 678642a6a274610dc62f627d43be9ca42286858a (patch) | |
| tree | 36777c606c0b6fe88e13b11c917c242c1bc997d2 /apps/files | |
| parent | 87e3e2925044831e5fd962207b4a6e9cd29b3f4f (diff) | |
| parent | 4b1b93507df4f7c9e0792c0de330ca358d9d38e0 (diff) | |
| download | nextcloud-server-678642a6a274610dc62f627d43be9ca42286858a.tar.gz nextcloud-server-678642a6a274610dc62f627d43be9ca42286858a.zip | |
Merge pull request #12935 from owncloud/public-tagsmanagerissue
Only populate tags in main file list
Diffstat (limited to 'apps/files')
| -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); } |