Fix inconsistencies in clientError() messages

[quix0rs-gnu-social.git] / classes / Foreign_link.php

diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php
index bc3ab006db43ea17f572f88828f1ed9707cf3de7..e47b2e3096c7c2d88c99739ef37c64f263318655 100644 (file)
--- a/classes/Foreign_link.php
+++ b/classes/Foreign_link.php
@@ -14,7 +14,6 @@ class Foreign_link extends Memcached_DataObject
     public $foreign_id;                      // bigint(8)  primary_key not_null unsigned
     public $service;                         // int(4)  primary_key not_null
     public $credentials;                     // varchar(255)
-    public $token;                           // varchar(255)
     public $noticesync;                      // tinyint(1)   not_null default_1
     public $friendsync;                      // tinyint(1)   not_null default_2
     public $profilesync;                     // tinyint(1)   not_null default_1
@@ -114,4 +113,21 @@ class Foreign_link extends Memcached_DataObject
         return User::staticGet($this->user_id);
     }
 
+    // Make sure we only ever delete one record at a time
+    function safeDelete()
+    {
+        if (!empty($this->user_id)
+            && !empty($this->foreign_id)
+            && !empty($this->service))
+        {
+            return $this->delete();
+        } else {
+            common_debug(LOG_WARNING,
+                'Foreign_link::safeDelete() tried to delete a '
+                . 'Foreign_link without a fully specified compound key: '
+                . var_export($this, true));
+            return false;
+        }
+    }
+
 }