oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged revisions 5224 via svnmerge from

Browse source 
https://svn.webgui.org/plainblack/branch/WebGUI_7.4

........
  r5224 | graham | 2008-01-02 16:18:53 -0600 (Wed, 02 Jan 2008) | 1 line
  
  fix: Assets with no committed versions may be left as orphans when parent is purged
........
This commit is contained in:
Graham Knop 2008-01-02 22:26:42 +00:00
parent 8b71032a98
commit ba44d57e9f
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
docs/changelog/7.x.x.txt
View file

@ -15,6 +15,9 @@
- Fixed chdir problem in Storage -- more remain though - Fixed chdir problem in Storage -- more remain though
- Added a new plugin handler system that is both faster and more secure. - Added a new plugin handler system that is both faster and more secure.
7.4.20
- fix: Assets with no committed versions may be left as orphans when parent is purged
7.4.19 7.4.19
- fix: Import Package does nothing when re-importing trashed package - fix: Import Package does nothing when re-importing trashed package
- fix: CS Posts get re-ordered when copy/paste - fix: CS Posts get re-ordered when copy/paste

6
lib/WebGUI/AssetTrash.pm
View file

@ -133,7 +133,11 @@ sub purge {
} }
# assassinate the offspring # assassinate the offspring
my $kids = $self->getLineage(["children"],{returnObjects=>1, statesToInclude=>['published', 'clipboard', 'clipboard-limbo','trash','trash-limbo']}); my $kids = $self->getLineage(["children"],{
returnObjects => 1,
statesToInclude => [qw(published clipboard clipboard-limbo trash trash-limbo)],
statusToInclude => [qw(approved archived pending)],
});
foreach my $kid (@{$kids}) { foreach my $kid (@{$kids}) {
# Technically get lineage should never return an undefined object from getLineage when called like this, but it did so this saves the world from destruction. # Technically get lineage should never return an undefined object from getLineage when called like this, but it did so this saves the world from destruction.
if (defined $kid) { if (defined $kid) {