diff options
Diffstat (limited to 'apps/files/lib/Helper.php')
| -rw-r--r-- | apps/files/lib/Helper.php | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/apps/files/lib/Helper.php b/apps/files/lib/Helper.php index 4a5595999d2..3eddbbaebf8 100644 --- a/apps/files/lib/Helper.php +++ b/apps/files/lib/Helper.php @@ -32,6 +32,7 @@ namespace OCA\Files; use OCP\Files\FileInfo; +use OCP\ITagManager; /** * Helper class for manipulating file information @@ -206,40 +207,39 @@ class Helper { * * @param array $fileList * @param string $fileIdentifier identifier attribute name for values in $fileList + * @param ITagManager $tagManager * @return array file list populated with tags */ - public static function populateTags(array $fileList, $fileIdentifier = 'fileid') { - $filesById = []; + public static function populateTags(array $fileList, $fileIdentifier = 'fileid', ITagManager $tagManager) { + $ids = []; foreach ($fileList as $fileData) { - $filesById[$fileData[$fileIdentifier]] = $fileData; + $ids[] = $fileData[$fileIdentifier]; } - $tagger = \OC::$server->getTagManager()->load('files'); - $tags = $tagger->getTagsForObjects(array_keys($filesById)); + $tagger = $tagManager->load('files'); + $tags = $tagger->getTagsForObjects($ids); if (!is_array($tags)) { throw new \UnexpectedValueException('$tags must be an array'); } + // Set empty tag array + foreach ($fileList as $key => $fileData) { + $fileList[$key]['tags'] = []; + } + if (!empty($tags)) { foreach ($tags as $fileId => $fileTags) { - $filesById[$fileId]['tags'] = $fileTags; - } - foreach ($filesById as $key => $fileWithTags) { - foreach($fileList as $key2 => $file){ - if( $file[$fileIdentifier] === $key){ - $fileList[$key2] = $fileWithTags; + foreach ($fileList as $key => $fileData) { + if ($fileId !== $fileData[$fileIdentifier]) { + continue; } - } - } - foreach ($fileList as $key => $file) { - if (!array_key_exists('tags', $file)) { - $fileList[$key]['tags'] = []; + $fileList[$key]['tags'] = $fileTags; } } - } + return $fileList; } |