summaryrefslogtreecommitdiff
path: root/actions/apiblockdestroy.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-12-28 15:49:14 -0800
committerEvan Prodromou <evan@status.net>2009-12-28 15:49:14 -0800
commit98a579fedf36ff795e255a4b345651df0ee230bc (patch)
tree2eba012e0094cced9580523051b8ed88b6aefd6b /actions/apiblockdestroy.php
parent5f6df8c0c4274e7d900335bba87341f9768e7467 (diff)
parentfa3301cf84ee0a78c4e00c7bd309de8a769fd848 (diff)
Merge branch 'master' into 0.9.x
Diffstat (limited to 'actions/apiblockdestroy.php')
-rw-r--r--actions/apiblockdestroy.php13
1 files changed, 10 insertions, 3 deletions
diff --git a/actions/apiblockdestroy.php b/actions/apiblockdestroy.php
index 328f18ab0..666f308f4 100644
--- a/actions/apiblockdestroy.php
+++ b/actions/apiblockdestroy.php
@@ -97,9 +97,16 @@ class ApiBlockDestroyAction extends ApiAuthAction
return;
}
- if (!$this->user->hasBlocked($this->other)
- || $this->user->unblock($this->other)
- ) {
+ if ($this->user->hasBlocked($this->other)) {
+ if (Event::handle('StartUnblockProfile', array($this->user, $this->other))) {
+ $result = $this->user->unblock($this->other);
+ if ($result) {
+ Event::handle('EndUnblockProfile', array($this->user, $this->other));
+ }
+ }
+ }
+
+ if (!$this->user->hasBlocked($this->other)) {
$this->initDocument($this->format);
$this->showProfile($this->other, $this->format);
$this->endDocument($this->format);