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

2009-01-16 16:42:34 +00:00 · 2009-01-16 16:42:34 +00:00 · 1a02d681fa
parent 20b4cae84a 3bb7ea79c0
commit 1a02d681fa
1 changed files with 1 additions and 1 deletions
--- 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;