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

diff --git a/.gitignore b/.gitignore
index 8c94886e7cdaf2ba87bb1008f5e977af90f4c48c..f5a3e0212f8d7b11cf2a542d176a99da57b04819 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ config.php
 dataobject.ini
 *~
 *.bak
+*.orig
+*.rej

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 9c879c9650111da45e0732779c0e9a21e647ae43..d6d31c48384203b83275bfcb28e42232bec0f66f 100644 (file)
--- 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;