diff options
| author | Federico Marani <federico.marani@ymail.com> | 2009-03-07 13:54:54 +0000 |
|---|---|---|
| committer | Federico Marani <federico.marani@ymail.com> | 2009-03-07 13:54:54 +0000 |
| commit | bab3e1b8586f42bc1f0a5f96b6990d67c6b74446 (patch) | |
| tree | 559729d3330991c0c68da96350b71434ca4f6f87 /actions/twittersettings.php | |
| parent | a389f157baddafa91347c27194805580b1373e30 (diff) | |
| parent | 13c183e2f4e0738233658ca79103bbe4a6d57992 (diff) | |
Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x
Conflicts:
lib/util.php
Diffstat (limited to 'actions/twittersettings.php')
| -rw-r--r-- | actions/twittersettings.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php index 2d41469bb..a79859bbf 100644 --- a/actions/twittersettings.php +++ b/actions/twittersettings.php @@ -32,6 +32,7 @@ if (!defined('LACONICA')) { } require_once INSTALLDIR.'/lib/connectsettingsaction.php'; +require_once INSTALLDIR.'/lib/twitter.php'; define('SUBSCRIPTIONS', 80); @@ -90,7 +91,7 @@ class TwittersettingsAction extends ConnectSettingsAction $fuser = null; - $flink = Foreign_link::getByUserID($user->id, 1); // 1 == Twitter + $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE); if ($flink) { $fuser = $flink->getForeignUser(); @@ -358,7 +359,7 @@ class TwittersettingsAction extends ConnectSettingsAction $flink->user_id = $user->id; $flink->foreign_id = $twit_user->id; - $flink->service = 1; // Twitter + $flink->service = TWITTER_SERVICE; $flink->credentials = $password; $flink->created = common_sql_now(); |