diff options
author | Evan Prodromou <evan@controlyourself.ca> | 2008-12-08 13:57:28 -0500 |
---|---|---|
committer | Evan Prodromou <evan@controlyourself.ca> | 2008-12-08 13:57:28 -0500 |
commit | ef3d487ae02a6333b4e0f0714599ff1c3b7b729e (patch) | |
tree | f1e93c561e35ecc23fda597fd145bf3daf8ac733 /actions/unblock.php | |
parent | cd5eec767aaa88fab29e781b12d53d0c92226f3b (diff) |
enable block API
darcs-hash:20081208185728-5ed1f-8d5f6be6decfbb50deb4ca50bee13404d0c51b72.gz
Diffstat (limited to 'actions/unblock.php')
-rw-r--r-- | actions/unblock.php | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/actions/unblock.php b/actions/unblock.php index 192beaab5..d60cc7088 100644 --- a/actions/unblock.php +++ b/actions/unblock.php @@ -67,20 +67,10 @@ class UnblockAction extends Action { $cur = common_current_user(); - # Get the block record - - $block = Profile_block::get($cur->id, $this->profile->id); - - if (!$block) { - $this->client_error(_('That user is not blocked!')); - return; - } - - $result = $block->delete(); + $result = $cur->unblock($this->profile); if (!$result) { - common_log_db_error($block, 'DELETE', __FILE__); - $this->server_error(_('Could not delete block record.')); + $this->server_error(_('Error removing the block.')); return; } |