Merge pull request #12935 from owncloud/public-tagsmanagerissue

Only populate tags in main file list
remotes/origin/fix-10825
Morris Jobke 12 years ago
commit 678642a6a2
  1. 1
      apps/files/ajax/list.php
  2. 1
      apps/files/lib/helper.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;

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

Loading…
Cancel
Save