summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2008-09-23 03:45:29 -0400
committerZach Copley <zach@controlyourself.ca>2008-09-23 03:45:29 -0400
commit80cd381ab0a0d62477459bbebde1a0ad4f71823a (patch)
treeca89f5527c2de16e6a6e5db9849f9cf3100d1e03 /actions
parent8957f9cf894973c2ef75b74e0e475ec37d9cb989 (diff)
Twitter bridge - fix to allow linking to 'protected' Twitter users
darcs-hash:20080923074529-7b5ce-818fc75dd3a59ae2f1de1b73e1884dd8a826bd6e.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/twittersettings.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index f656b9b6b..bdf02013b 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -126,7 +126,7 @@ class TwittersettingsAction extends SettingsAction {
// Now that we have a valid Twitter user, we have to make another api call to
// find its Twitter ID. Dumb, but true.
- $twitter_id = $this->get_twitter_id($twitter_username);
+ $twitter_id = $this->get_twitter_id($twitter_username, $twitter_password);
if (!$twitter_id) {
$this->show_form(sprintf(_('Unable to retrieve account information for "%s" from Twitter.'), $twitter_username));
@@ -235,9 +235,9 @@ class TwittersettingsAction extends SettingsAction {
return;
}
- function get_twitter_id($twitter_username) {
- $uri = "http://twitter.com/users/show/$twitter_username.json";
- $data = $this->get_twitter_data($uri);
+ function get_twitter_id($user, $password) {
+ $uri = "http://twitter.com/users/show/$user.json";
+ $data = $this->get_twitter_data($uri, $user, $password);
if (!$data) {
return NULL;