aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-01-13 13:08:11 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-01-13 13:08:11 +0000
commit0b9e7e0e00273de31fc689a7ade222e9b0b5cbdd (patch)
tree7660beffd9ce7f0d6bc226b368d3e5410b1d6745
parent7f7decf9cb9084f6942ae9ea160f2e7c4d4a8b81 (diff)
downloadelgg-0b9e7e0e00273de31fc689a7ade222e9b0b5cbdd.tar.gz
elgg-0b9e7e0e00273de31fc689a7ade222e9b0b5cbdd.tar.bz2
Closes #676: Entity subtables now deleted on failed connections.
git-svn-id: https://code.elgg.org/elgg/trunk@2564 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/group.php6
-rw-r--r--engine/lib/objects.php3
-rw-r--r--engine/lib/sites.php6
-rw-r--r--engine/lib/users.php2
4 files changed, 11 insertions, 6 deletions
diff --git a/engine/lib/group.php b/engine/lib/group.php
index 31c0460b6..851b50af2 100644
--- a/engine/lib/group.php
+++ b/engine/lib/group.php
@@ -386,7 +386,8 @@
if (trigger_elgg_event('update',$entity->type,$entity)) {
return $guid;
} else {
- delete_entity($guid);
+ $entity->delete();
+ //delete_entity($guid);
}
}
}
@@ -399,7 +400,8 @@
if (trigger_elgg_event('create',$entity->type,$entity)) {
return $guid;
} else {
- delete_entity($guid);
+ $entity->delete();
+ //delete_entity($guid);
}
}
}
diff --git a/engine/lib/objects.php b/engine/lib/objects.php
index b9643bc87..fc67c585c 100644
--- a/engine/lib/objects.php
+++ b/engine/lib/objects.php
@@ -291,7 +291,8 @@
if (trigger_elgg_event('create',$entity->type,$entity)) {
return $guid;
} else {
- delete_entity($guid);
+ $entity->delete();
+ //delete_entity($guid);
}
}
}
diff --git a/engine/lib/sites.php b/engine/lib/sites.php
index f012b3cb4..bac6021b8 100644
--- a/engine/lib/sites.php
+++ b/engine/lib/sites.php
@@ -293,7 +293,8 @@
if (trigger_elgg_event('update',$entity->type,$entity)) {
return $guid;
} else {
- delete_entity($guid);
+ $entity->delete();
+ //delete_entity($guid);
}
}
}
@@ -306,7 +307,8 @@
if (trigger_elgg_event('create',$entity->type,$entity)) {
return $guid;
} else {
- delete_entity($guid);
+ $entity->delete();
+ //delete_entity($guid);
}
}
}
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 360c2c5e8..5d5153cc4 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -411,7 +411,7 @@
if (trigger_elgg_event('create',$entity->type,$entity)) {
return $guid;
} else {
- delete_entity($guid);
+ $entity->delete(); //delete_entity($guid);
}
}
}