Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
die_coolen_jungs
our_own_cloud_project
Commits
678642a6
Commit
678642a6
authored
Dec 19, 2014
by
Morris Jobke
Browse files
Merge pull request #12935 from owncloud/public-tagsmanagerissue
Only populate tags in main file list
parents
87e3e292
4b1b9350
Changes
2
Hide whitespace changes
Inline
Side-by-side
apps/files/ajax/list.php
View file @
678642a6
...
...
@@ -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
;
...
...
apps/files/lib/helper.php
View file @
678642a6
...
...
@@ -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
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment