Skip to content

Instantly share code, notes, and snippets.

@wilr
Created June 19, 2012 07:45
Show Gist options
  • Save wilr/2952851 to your computer and use it in GitHub Desktop.
Save wilr/2952851 to your computer and use it in GitHub Desktop.
Updates to CurrentMember
diff --git a/twitter/Controllers/Callback.php b/twitter/Controllers/Callback.php
index 38fa88c..33f9ab4 100644
--- a/twitter/Controllers/Callback.php
+++ b/twitter/Controllers/Callback.php
@@ -39,10 +39,11 @@ class TwitterCallback extends Controller {
public function FinishTwitter($request) {
$token = SecurityToken::inst();
if(!$token->checkRequest($request)) return $this->httpError(400);
- if($this->CurrentMember()->TwitterID) {
+
+ if(Member::currentUser()->TwitterID) {
return '<script type="text/javascript">//<![CDATA[
opener.TwitterResponse(' . \Convert::raw2json(array(
- 'handle' => $this->CurrentMember()->TwitterHandle,
+ 'handle' => Member::currentUser()->TwitterHandle,
'removeLink' => $token->addToUrl($this->Link('RemoveTwitter')),
)) . ');
window.close();
@@ -59,7 +60,7 @@ class TwitterCallback extends Controller {
public function RemoveTwitter($request) {
$token = SecurityToken::inst();
if(!$token->checkRequest($request)) return $this->httpError(400);
- $m = $this->CurrentMember();
+ $m = Member::currentUser();
$m->TwitterID = $m->TwitterHandle = $m->TwitterAccessToken = null;
$m->write();
}
@@ -215,7 +216,7 @@ class TwitterCallback extends Controller {
$data = $response->getBody();
$data = json_decode($data);
- if($m = $this->CurrentMember()) {
+ if($m = Member::currentUser()) {
$m->TwitterID = $data->id;
$m->TwitterAccessToken = json_encode(array(
'oauth_token' => $access->getParam('oauth_token'),
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment