summaryrefslogtreecommitdiff
path: root/actions
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-01-16 16:42:34 +0000
committerEvan Prodromou <evan@controlyourself.ca>2009-01-16 16:42:34 +0000
commit1a02d681fa1de7c2daed2ecc951f4c9bf1c13976 (patch)
treef96cfff8ee758f8c06faa08304cdae44f67be8e0 /actions
parent20b4cae84a1451804d43e63bb990d1d8c7337197 (diff)
parent3bb7ea79c023cc7260e456b6e1f17526494e5424 (diff)
Merge branch 'master' of /var/www/trunk into uiredesign
Diffstat (limited to 'actions')
-rw-r--r--actions/twittersettings.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 9c879c965..d6d31c483 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -354,7 +354,7 @@ class TwittersettingsAction extends SettingsAction
return false;
}
- $twitter_id = $user->status->id;
+ $twitter_id = $user->id;
if ($twitter_id) {
return $twitter_id;