From 3bb7ea79c023cc7260e456b6e1f17526494e5424 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Thu, 15 Jan 2009 11:29:45 -0800
Subject: Twitter bridge: verify creds was taking user ID from the status
 instead of the user object, and failing if user hadn't ever posted on
 Twitter.

---
 actions/twittersettings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 9e7e4cae8..62262e021 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;
-- 
cgit v1.2.3-54-g00ecf


From 41d958f11feba8be0c9375a4c424e51fd83fa20e Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Fri, 16 Jan 2009 16:43:10 +0000
Subject: Ignore .orig and .rej

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8c94886e7..f5a3e0212 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ config.php
 dataobject.ini
 *~
 *.bak
+*.orig
+*.rej
-- 
cgit v1.2.3-54-g00ecf