diff options
author | Evan Prodromou <evan@status.net> | 2009-12-28 15:49:14 -0800 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-12-28 15:49:14 -0800 |
commit | 98a579fedf36ff795e255a4b345651df0ee230bc (patch) | |
tree | 2eba012e0094cced9580523051b8ed88b6aefd6b /actions/block.php | |
parent | 5f6df8c0c4274e7d900335bba87341f9768e7467 (diff) | |
parent | fa3301cf84ee0a78c4e00c7bd309de8a769fd848 (diff) |
Merge branch 'master' into 0.9.x
Diffstat (limited to 'actions/block.php')
-rw-r--r-- | actions/block.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/actions/block.php b/actions/block.php index 71a34e087..5fae45dff 100644 --- a/actions/block.php +++ b/actions/block.php @@ -156,7 +156,12 @@ class BlockAction extends ProfileFormAction { $cur = common_current_user(); - $result = $cur->block($this->profile); + if (Event::handle('StartBlockProfile', array($cur, $this->profile))) { + $result = $cur->block($this->profile); + if ($result) { + Event::handle('EndBlockProfile', array($cur, $this->profile)); + } + } if (!$result) { $this->serverError(_('Failed to save block information.')); @@ -164,4 +169,3 @@ class BlockAction extends ProfileFormAction } } } - |