From 7a9040e3607387d64cf5b3098ab787c37cdacac5 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 20 Jan 2011 15:47:51 -0800 Subject: [PATCH] Fix inconsistent use of 'name' vs 'fullname' in tw_fields member variable --- plugins/TwitterBridge/twitterauthorization.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/TwitterBridge/twitterauthorization.php b/plugins/TwitterBridge/twitterauthorization.php index 28b40cc4f4..cc3af58878 100644 --- a/plugins/TwitterBridge/twitterauthorization.php +++ b/plugins/TwitterBridge/twitterauthorization.php @@ -241,7 +241,7 @@ class TwitterauthorizationAction extends Action $this->twuid = $twitter_user->id; $this->tw_fields = array("screen_name" => $twitter_user->screen_name, - "name" => $twitter_user->name); + "fullname" => $twitter_user->name); $this->access_token = $atok; $this->tryLogin(); } @@ -373,7 +373,7 @@ class TwitterauthorizationAction extends Action $this->hidden('access_token_secret', $this->access_token->secret); $this->hidden('twuid', $this->twuid); $this->hidden('tw_fields_screen_name', $this->tw_fields['screen_name']); - $this->hidden('tw_fields_name', $this->tw_fields['name']); + $this->hidden('tw_fields_name', $this->tw_fields['fullname']); $this->elementStart('fieldset'); $this->hidden('token', common_session_token()); @@ -462,7 +462,7 @@ class TwitterauthorizationAction extends Action return; } - $fullname = trim($this->tw_fields['name']); + $fullname = trim($this->tw_fields['fullname']); $args = array('nickname' => $nickname, 'fullname' => $fullname); @@ -602,8 +602,8 @@ class TwitterauthorizationAction extends Action function bestNewNickname() { - if (!empty($this->tw_fields['name'])) { - $nickname = $this->nicknamize($this->tw_fields['name']); + if (!empty($this->tw_fields['fullname'])) { + $nickname = $this->nicknamize($this->tw_fields['fullname']); if ($this->isNewNickname($nickname)) { return $nickname; } -- 2.39.5