Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase

Conflicts:
	lib/profileblock.php
	theme/default/css/display.css
This commit is contained in:
Shashi Gowda
2011-04-09 21:57:45 +05:30
206 changed files with 314 additions and 17667 deletions

View File

@@ -307,4 +307,14 @@ class AccountProfileBlock extends ProfileBlock
// TRANS: Link text for link that will subscribe to a remote profile.
_m('BUTTON','Subscribe'));
}
function show()
{
$this->out->elementStart('div', 'account_profile_block section');
if (Event::handle('StartShowAccountProfileBlock', array($this->out, $this->profile))) {
parent::show();
Event::handle('EndShowAccountProfileBlock', array($this->out, $this->profile));
}
$this->out->elementEnd('div');
}
}