From 029b8c90142e08b0ed44f0528ddea7d4dcc32980 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 5 Mar 2010 02:27:01 +0000
Subject: Fix for errant deletion of all Twitter foreign_links

---
 plugins/TwitterBridge/twittersettings.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'plugins/TwitterBridge/twittersettings.php')

diff --git a/plugins/TwitterBridge/twittersettings.php b/plugins/TwitterBridge/twittersettings.php
index 0137060e9..f22a059f7 100644
--- a/plugins/TwitterBridge/twittersettings.php
+++ b/plugins/TwitterBridge/twittersettings.php
@@ -250,7 +250,16 @@ class TwittersettingsAction extends ConnectSettingsAction
         $user = common_current_user();
         $flink = Foreign_link::getByUserID($user->id, TWITTER_SERVICE);
 
-        $result = $flink->delete();
+        $result = false;
+
+        // Be extra careful to make sure we have a good flink
+        // before deleting
+        if (!empty($flink->user_id)
+            && !empty($flink->foreign_id)
+            && !empty($flink->service))
+        {
+            $result = $flink->delete();
+        }
 
         if (empty($result)) {
             common_log_db_error($flink, 'DELETE', __FILE__);
-- 
cgit v1.2.3-54-g00ecf