Merge branch '0.9.x' into adminpanel

diff --combined classes/User.php
index 6162f83b882d3007c429616e49eaec2b8722928b,9b90ce61bfaf65e4ff2fa285f2cff18cb7c5913c..447a34141b1c28b90f38f95c2abc85acfd27c733
--- 1/classes/User.php
--- 2/classes/User.php
+++ b/classes/User.php
@@@ -710,7 -710,6 +710,7 @@@ class User extends Memcached_DataObjec
                  break;
              case Right::CONFIGURESITE:
                  $result = $this->hasRole(User_role::ADMINISTRATOR);
 +                break;
              default:
                  $result = false;
                  break;
@@@ -722,16 -721,18 +722,18 @@@
      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();