diff options
author | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-03-06 16:24:08 +0000 |
---|---|---|
committer | marcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2009-03-06 16:24:08 +0000 |
commit | 5254adc2f10ba7d18851570e87ed1fbce4649deb (patch) | |
tree | 8555d2bc4b7cce8677e816dce270db10e90e0921 /engine/lib/sites.php | |
parent | b389316fdc5f334ed5154b0b5057e81d9e640135 (diff) | |
download | elgg-5254adc2f10ba7d18851570e87ed1fbce4649deb.tar.gz elgg-5254adc2f10ba7d18851570e87ed1fbce4649deb.tar.bz2 |
Reversed delete procedure on entities, parent now checked first before sub deleted. Any stubs left over will be handled by the garbage collector.
git-svn-id: https://code.elgg.org/elgg/trunk@3119 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/sites.php')
-rw-r--r-- | engine/lib/sites.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/sites.php b/engine/lib/sites.php index 5fc646c17..037a5f331 100644 --- a/engine/lib/sites.php +++ b/engine/lib/sites.php @@ -139,10 +139,10 @@ if ($CONFIG->site->getGUID() == $this->guid) throw new SecurityException('SecurityException:deletedisablecurrentsite'); - if (!delete_site_entity($this->get('guid'))) - return false; + if (parent::delete) + return delete_site_entity($this->get('guid')); - return parent::delete(); + return false; } /** |