diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 608a5138a..99858c547 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -40,6 +40,7 @@
- fix [ 1428396 ] IP Filter Broken
- fixed a bug where uploaded files and images did not get the right .wgaccess
file (Martin Kamerbeek / Procolix)
+ - fix [ 1429349 ] Invalid HTML returned by func=manageAssets
6.8.5
- fix [ 1396957 ] Insufficient privileges check on the DataForm
diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm
index 4df33bea4..67c364e82 100644
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@@ -1046,12 +1046,12 @@ sub manageAssets {
my $edit;
if ($child->isLocked) {
$locked = '
';
- $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit<\\/a> | '+" if ($child->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId"));
+ $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+" if ($child->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId"));
} else {
- $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit<\\/a> | '+";
+ $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+";
$locked = '
';
}
- my $lockLink = ", 'getUrl("func=manageRevisions")."\">".$locked."<\\/a>'" unless ($self->session->setting->get("autoCommit"));
+ my $lockLink = ", 'getUrl("func=manageRevisions")."\">".$locked."'" unless ($self->session->setting->get("autoCommit"));
$output .= "assetManager.AddLine('"
.WebGUI::Form::checkbox($self->session,{
name=>'assetId',
@@ -1060,7 +1060,7 @@ sub manageAssets {
."',".$edit."contextMenu.draw(),"
.$child->getRank
.",'getUrl("func=manageAssets")."\">".$title
- ."<\\/a>','
getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
+ ."','
getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n";
$output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName
@@ -1208,12 +1208,12 @@ sub manageAssetsSearch {
my $edit;
if ($child->isLocked) {
$locked = '
';
- $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit<\\/a> | '+" if ($child->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId"));
+ $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+" if ($child->canEditIfLocked && $self->session->scratch->get("versionTag") eq $self->get("tagId"));
} else {
- $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit<\\/a> | '+";
+ $edit = "'getUrl("func=edit;proceed=manageAssets")."\">Edit | '+";
$locked = '
';
}
- my $lockLink = ", 'getUrl("func=manageRevisions")."\">".$locked."<\\/a>'" unless ($self->session->setting->get("autoCommit"));
+ my $lockLink = ", 'getUrl("func=manageRevisions")."\">".$locked."'" unless ($self->session->setting->get("autoCommit"));
$output .= "assetManager.AddLine('"
.WebGUI::Form::checkbox($self->session,{
name=>'assetId',
@@ -1222,7 +1222,7 @@ sub manageAssetsSearch {
."',".$edit."contextMenu.draw(),"
.$child->getRank
.",'getUrl("func=manageAssets&manage=1")."\">".$title
- ."<\\/a>','
getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
+ ."','
getIcon(1)."\" border=\"0\" alt=\"".$child->getName."\" /> ".$child->getName
."','".$self->session->datetime->epochToHuman($child->get("revisionDate"))
."','".formatBytes($child->get("assetSize"))."'".$lockLink.");\n";
$output .= "assetManager.AddLineSortData('','','','".$title."','".$child->getName