Merge branch 'master' of /var/www/trunk into uiredesign

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;