summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2008-08-26 22:16:35 -0400
committerZach Copley <zach@controlyourself.ca>2008-08-26 22:16:35 -0400
commitf5c9a6ebcffa87fddc562d9728a3e4f3b86a3355 (patch)
treee0d28423ac2dbb5c6474356b0d0883f6fdf8a15d /actions
parent3cf6cef9b9ef2837b38fb0f11097775fdc1efdee (diff)
Twitter integration - decided to change Twitter to service ID #1
darcs-hash:20080827021635-7b5ce-9b96743999aa85a505aecd5f25867937f0c34434.gz
Diffstat (limited to 'actions')
-rw-r--r--actions/twittersettings.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 0aae7f7e4..8f02956a3 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -32,7 +32,7 @@ class TwittersettingsAction extends SettingsAction {
$user = common_current_user();
$profile = $user->getProfile();
- $fuser = Foreign_user::getForeignUser($user->id, 0);
+ $fuser = Foreign_user::getForeignUser($user->id, 1);
$this->form_header(_('Twitter settings'), $msg, $success);
@@ -45,7 +45,7 @@ class TwittersettingsAction extends SettingsAction {
common_element_start('p');
- common_element('span', 'Twitter User', "http://www.twitter.com/$fuser->nickname");
+ common_element('span', 'Twitter User', $fuser->uri);
common_element('span', 'input_instructions',
_('Current verified Twitter User'));
common_hidden('fuser_id', $fuser->id);
@@ -94,7 +94,7 @@ class TwittersettingsAction extends SettingsAction {
function add_twitter_acct() {
$user = common_current_user();
- $fuser = Foreign_user::getForeignUser($user->id, 0);
+ $fuser = Foreign_user::getForeignUser($user->id, 1);
$twitter_username = $this->trimmed('twitter_username');
@@ -127,7 +127,7 @@ class TwittersettingsAction extends SettingsAction {
$fuser = Foreign_user::save(
array(
'id' => $twitter_id,
- 'service' => '0', // Twitter
+ 'service' => '1', // 1 == Twitter
'uri' => "http://www.twitter.com/$twitter_username",
'nickname' => $twitter_username,
'user_id' => $user->id,
@@ -144,7 +144,7 @@ class TwittersettingsAction extends SettingsAction {
function remove_twitter_acct() {
$user = common_current_user();
- $fuser = Foreign_user::getForeignUser($user->id, 0);
+ $fuser = Foreign_user::getForeignUser($user->id, 1);
$fuser_id = $this->arg('fuser_id');
@@ -169,7 +169,7 @@ class TwittersettingsAction extends SettingsAction {
function save_preferences() {
$user = common_current_user();
- $fuser = Foreign_user::getForeignUser($user->id, 0);
+ $fuser = Foreign_user::getForeignUser($user->id, 1);
$this->show_form(_('Save doesn\'t do anything yet.'));