upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 08:44:07 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge pull request #12935 from owncloud/public-tagsmanagerissue

Browse source 
Only populate tags in main file list
This commit is contained in:
Morris Jobke 2014-12-19 12:48:20 +01:00
commit 678642a6a2
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/files/ajax/list.php
View file

@ -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;

1
apps/files/lib/helper.php
View file

@ -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);
}