diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 74faabaea..d4587e298 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -4,6 +4,7 @@ - fix: Delete this entry link in data form header broken - fix: Image uploads fail when not using preload.perl - fix: Workflow activities don't pick up new default values + - safely allow sorting by more fields in collaboration systems 7.4.10 - fix: Graphs aren't sized properly using GraphicsMagick diff --git a/lib/WebGUI/Asset/Wobject/Collaboration.pm b/lib/WebGUI/Asset/Wobject/Collaboration.pm index c82674ebc..56d43fea2 100644 --- a/lib/WebGUI/Asset/Wobject/Collaboration.pm +++ b/lib/WebGUI/Asset/Wobject/Collaboration.pm @@ -934,9 +934,6 @@ sub getThreadsPaginator { my $scratchSortBy = $self->getId."_sortBy"; my $scratchSortOrder = $self->getId."_sortDir"; my $sortBy = $self->session->form->process("sortBy") || $self->session->scratch->get($scratchSortBy) || $self->get("sortBy"); - if (!isIn($sortBy, qw(lineage assetData.revisionDate creationDate title userDefined1 userDefined2 userDefined3 userDefuned4 userDefined5 karmaRank))) { - $sortBy = ''; - } my $sortOrder = $self->session->scratch->get($scratchSortOrder) || $self->get("sortOrder"); if ($sortBy ne $self->session->scratch->get($scratchSortBy) && $self->session->form->process("func") ne "editSave") { $self->session->scratch->set($scratchSortBy,$self->session->form->process("sortBy")); @@ -954,7 +951,7 @@ sub getThreadsPaginator { if ($sortBy eq 'rating') { $sortBy = 'threadRating'; } - + $sortBy = $self->session->db->dbh->quote_identifier($sortBy); my $sql = " select asset.assetId,