aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authormarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-04-22 15:49:24 +0000
committermarcus <marcus@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-04-22 15:49:24 +0000
commit9d862819cf8f1d9f14a4f5465ca84579b05fb959 (patch)
treeb7c489f15e8d544163ca543f02e02f84b8516b6e /engine/lib
parent8b5fd806d6871aaeb179376328a8af215ed44f88 (diff)
downloadelgg-9d862819cf8f1d9f14a4f5465ca84579b05fb959.tar.gz
elgg-9d862819cf8f1d9f14a4f5465ca84579b05fb959.tar.bz2
Deleting correct data + using correct tables
git-svn-id: https://code.elgg.org/elgg/trunk@3228 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/annotations.php4
-rw-r--r--engine/lib/metadata.php4
-rw-r--r--engine/lib/users.php4
3 files changed, 8 insertions, 4 deletions
diff --git a/engine/lib/annotations.php b/engine/lib/annotations.php
index dd647444a..47903616a 100644
--- a/engine/lib/annotations.php
+++ b/engine/lib/annotations.php
@@ -829,6 +829,8 @@
*/
function clear_annotations_by_owner($owner_guid)
{
+ global $CONFIG;
+
$owner_guid = (int)$owner_guid;
$annotations = get_data("SELECT id from {$CONFIG->dbprefix}annotations WHERE owner_guid=$owner_guid");
@@ -836,7 +838,7 @@
foreach ($annotations as $id)
{
- if (delete_annotation($id)) // Is this the best way?
+ if (delete_annotation($id->id)) // Is this the best way?
$deleted++;
}
diff --git a/engine/lib/metadata.php b/engine/lib/metadata.php
index 57987107c..ca127c386 100644
--- a/engine/lib/metadata.php
+++ b/engine/lib/metadata.php
@@ -739,6 +739,8 @@
*/
function clear_metadata_by_owner($owner_guid)
{
+ global $CONFIG;
+
$owner_guid = (int)$owner_guid;
$metas = get_data("SELECT id from {$CONFIG->dbprefix}metadata WHERE owner_guid=$owner_guid");
@@ -746,7 +748,7 @@
foreach ($metas as $id)
{
- if (delete_metadata($id)) // Is this the best way?
+ if (delete_metadata($id->id)) // Is this the best way?
$deleted++;
}
diff --git a/engine/lib/users.php b/engine/lib/users.php
index 5a9234dc6..cddc89b3a 100644
--- a/engine/lib/users.php
+++ b/engine/lib/users.php
@@ -153,8 +153,8 @@
public function delete()
{
// Delete owned data
- clear_annotations_by_owner($this->owner_guid);
- clear_metadata_by_owner($this->owner_guid);
+ clear_annotations_by_owner($this->guid);
+ clear_metadata_by_owner($this->guid);
// Delete entity
return parent::delete();