From f55acecbb6013e5b2d2e7ab59cc19bfe712be174 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 9 Mar 2010 08:53:11 -0800 Subject: [PATCH] Handle the edge case when a subscription group has been deleted, but the the Subscribable entry has not been cleaned up. Fixes bug #11456. --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/AssetAspect/Subscribable.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index e2b97679a..3230f5661 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -12,6 +12,7 @@ - fixed #11458: Use packed template removes wanted whitespace - fixed #11459: "default template" warning after upgrade to 7.8.14 - added #11460: Override the search root asset. (United Knowledge) + - fixed #11456: Delete a wiki (Reopen #11446 - subscription groups) 7.8.13 - fixed #11418: confusing typ-o in gotcha diff --git a/lib/WebGUI/AssetAspect/Subscribable.pm b/lib/WebGUI/AssetAspect/Subscribable.pm index 6614065d5..f1a3eeb70 100644 --- a/lib/WebGUI/AssetAspect/Subscribable.pm +++ b/lib/WebGUI/AssetAspect/Subscribable.pm @@ -428,7 +428,7 @@ sub purge { my $options = shift; my $group = $self->getSubscriptionGroup(); - $group->delete; + $group->delete if $group; my $success = $self->next::method($options); return $success;