From 8d44b6a5a2965b37002efd26f23a7cfeb5109391 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 8 Nov 2009 14:33:22 +0100
Subject: [PATCH] Fix bug 1962: deleteuser.php regression when OpenID plugin
 not enabled

The User_openid data object was explicitly listed as a related field to delete from in User::delete(); this class doesn't exist anymore by default since OpenID was broken out to a plugin.
Added UserDeleteRelated event for plugins to add related tables to delete from at user delete time.
---
 EVENTS.txt                      | 3 +++
 classes/User.php                | 6 ++++--
 plugins/OpenID/OpenIDPlugin.php | 6 ++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 92c4110256..25a51516b4 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -489,3 +489,6 @@ ChangePassword: Handle a password change request
 - $newpassword: the desired new password
 - &$errormsg: set this to an error message if the password could not be changed. If the password was changed, leave this as false
 
+UserDeleteRelated: Specify additional tables to delete entries from when deleting users
+- $user: User object
+- &$related: array of DB_DataObject class names to delete entries on matching user_id.
diff --git a/classes/User.php b/classes/User.php
index 96a64ccb29..b0d372be85 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -719,16 +719,18 @@ class User extends Memcached_DataObject
     function delete()
     {
         $profile = $this->getProfile();
-        $profile->delete();
+        if ($profile) {
+            $profile->delete();
+        }
 
         $related = array('Fave',
-                         'User_openid',
                          'Confirm_address',
                          'Remember_me',
                          'Foreign_link',
                          'Invitation',
                          'Notice_inbox',
                          );
+        Event::handle('UserDeleteRelated', array($this, &$related));
 
         foreach ($related as $cls) {
             $inst = new $cls();
diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index 2309eea9df..e4aed2ddbe 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -298,4 +298,10 @@ class OpenIDPlugin extends Plugin
                                    new ColumnDef('modified', 'timestamp')));
         return true;
     }
+
+    function onUserDeleteRelated($user, &$tables)
+    {
+        $tables[] = 'User_openid';
+        return true;
+    }
 }