aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/objects.php
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-13 11:17:44 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-08-13 11:17:44 +0000
commit10d2d5f1aec057ab5023890d407b59e2366c4398 (patch)
treed3c18cc54f6eb3babcb7b3acc5178edb352ff629 /engine/lib/objects.php
parent95b89b5b595d688b54abc98158623ecdea40d330 (diff)
downloadelgg-10d2d5f1aec057ab5023890d407b59e2366c4398.tar.gz
elgg-10d2d5f1aec057ab5023890d407b59e2366c4398.tar.bz2
Fixes #241: Changed order, delete user using object's delete method rather than the low level function
git-svn-id: https://code.elgg.org/elgg/trunk@1887 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/objects.php')
-rw-r--r--engine/lib/objects.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index 69f4f709a..1815ac717 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -127,11 +127,11 @@
* @return true|false
*/
public function delete()
- {
- if (!parent::delete())
- return false;
-
- return delete_object_entity($this->get('guid'));
+ {
+ if (!delete_object_entity($this->get('guid')))
+ return false;
+
+ return parent::delete();
}
/**