diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index dd9ecbd49..8f8c6a750 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -1656,8 +1656,8 @@ sub publish { my $self = shift; my $statesToPublish = shift; - my $stateList = $self->session->db->quoteAndJoin($statesToPublish); - my $where = "and state in (".$stateList.")" if $statesToPublish; + my $stateList = $self->session->db->quoteAndJoin($statesToPublish) if $statesToPublish; + my $where = "and state in (".$stateList.")" if $stateList; my $assetIds = $self->session->db->buildArrayRef("select assetId from asset where lineage like ".$self->session->db->quote($self->get("lineage").'%')." $where"); my $idList = $self->session->db->quoteAndJoin($assetIds); diff --git a/lib/WebGUI/AssetClipboard.pm b/lib/WebGUI/AssetClipboard.pm index 9f49e2836..0c7c675f1 100644 --- a/lib/WebGUI/AssetClipboard.pm +++ b/lib/WebGUI/AssetClipboard.pm @@ -153,7 +153,7 @@ sub paste { my $pastedAsset = WebGUI::Asset->newByDynamicClass($self->session,$assetId); return 0 unless ($self->get("state") eq "published"); if ($self->getId eq $pastedAsset->get("parentId") || $pastedAsset->setParent($self)) { - $pastedAsset->publish(['published']); # Paste only published assets + $pastedAsset->publish(['clipboard','clipboard-limbo']); # Paste only clipboard items $pastedAsset->updateHistory("pasted to parent ".$self->getId); return 1; }