Merge branch 'testing' into 0.9.x

diff --combined lib/userprofile.php
index 1e4543a5a202871d20e2ba9fc8166f85622c2114,2c3b1ea453bb4460291ba49273cd2dc88c566a15..ca060842b6e9b44d2acf742f88bdd4fb2815d45f
--- 1/lib/userprofile.php
--- 2/lib/userprofile.php
+++ b/lib/userprofile.php
@@@ -71,8 -71,7 +71,8 @@@ class UserProfile extends Widge
      {
          if (Event::handle('StartProfilePageProfileSection', array(&$this->out, $this->profile))) {
  
 -            $this->out->elementStart('div', 'entity_profile vcard author');
 +            $this->out->elementStart('div', array('id' => 'i',
 +                                                  'class' => 'entity_profile vcard author'));
              $this->out->element('h2', null, _('User profile'));
  
              if (Event::handle('StartProfilePageProfileElements', array(&$this->out, $this->profile))) {
@@@ -229,6 -228,17 +229,17 @@@
  
      function showEntityActions()
      {
+         if ($this->profile->hasRole(Profile_role::DELETED)) {
+             $this->out->elementStart('div', 'entity_actions');
+             $this->out->element('h2', null, _('User actions'));
+             $this->out->elementStart('ul');
+             $this->out->elementStart('p', array('class' => 'profile_deleted'));
+             $this->out->text(_('User deletion in progress...'));
+             $this->out->elementEnd('p');
+             $this->out->elementEnd('ul');
+             $this->out->elementEnd('div');
+             return;
+         }
          if (Event::handle('StartProfilePageActionsSection', array(&$this->out, $this->profile))) {
  
              $cur = common_current_user();