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

This commit is contained in:
Evan Prodromou 2009-01-16 16:42:34 +00:00
commit 1a02d681fa

View File

@ -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;