diff options
author | Brion Vibber <brion@pobox.com> | 2010-03-29 15:15:51 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-03-29 15:15:51 -0700 |
commit | 01a03e34c8d286011c0f4301e60c103d992a449a (patch) | |
tree | d9c5a44704b83d3ca05ed1f136a3748fb8210f12 /classes/User.php | |
parent | e2d3ebb9f4a3b516067745d250b4723367b928c2 (diff) | |
parent | cfeb1bfa419e886a1b60dfcbd4260d2f5de0515b (diff) |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'classes/User.php')
-rw-r--r-- | classes/User.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/classes/User.php b/classes/User.php index 1ba940a69..f1ebe07b9 100644 --- a/classes/User.php +++ b/classes/User.php @@ -665,8 +665,12 @@ class User extends Memcached_DataObject function delete() { - $profile = $this->getProfile(); - $profile->delete(); + try { + $profile = $this->getProfile(); + $profile->delete(); + } catch (UserNoProfileException $unp) { + common_log(LOG_INFO, "User {$this->nickname} has no profile; continuing deletion."); + } $related = array('Fave', 'Confirm_address', @@ -674,6 +678,7 @@ class User extends Memcached_DataObject 'Foreign_link', 'Invitation', ); + Event::handle('UserDeleteRelated', array($this, &$related)); foreach ($related as $cls) { |