Merge branch 'uiredesign' of ../evan into uiredesign

This commit is contained in:
sarven 2009-01-16 17:03:37 +00:00
commit dce8cf6845
2 changed files with 3 additions and 1 deletions

2
.gitignore vendored
View File

@ -7,3 +7,5 @@ config.php
dataobject.ini
*~
*.bak
*.orig
*.rej

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;