Skip to content

Commit

Permalink
Fix errors in Rest controller, and missing OPTIONS action for /users/me
Browse files Browse the repository at this point in the history
  • Loading branch information
rjmackay committed Jan 22, 2015
1 parent d43f4cb commit 14a52d1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
10 changes: 10 additions & 0 deletions application/classes/Controller/Api/Users.php
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,16 @@ public function action_get_me()
}
}

/**
* Get options for /users/me
*
* @return void
*/
public function action_options_me()
{
$this->response->status(200);
}

/**
* Update current user
*
Expand Down
10 changes: 10 additions & 0 deletions application/classes/Ushahidi/Rest.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,16 @@ abstract class Ushahidi_Rest extends Controller {
*/
protected static $version = '2';

/**
* @var Object Request Payload
*/
protected $_request_payload = NULL;

/**
* @var Object Response Payload
*/
protected $_response_payload = NULL;

/**
* @var array Map of HTTP methods -> actions
*/
Expand Down

0 comments on commit 14a52d1

Please sign in to comment.