Merge remote-tracking branch 'upstream/master'

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

diff --git a/classes/Foreign_link.php b/classes/Foreign_link.php
index 6176ec43bc3f3a1bf568ce4effb3e66726697219..b3757448ade7e59f5d04d27fbff555154b8f6cb0 100644 (file)
--- a/classes/Foreign_link.php
+++ b/classes/Foreign_link.php
@@ -56,34 +56,37 @@ class Foreign_link extends Managed_DataObject
     static function getByUserID($user_id, $service)
     {
         if (empty($user_id) || empty($service)) {
-            return null;
+            throw new ServerException('Empty user_id or service for Foreign_link::getByUserID');
         }
 
         $flink = new Foreign_link();
-
         $flink->service = $service;
         $flink->user_id = $user_id;
         $flink->limit(1);
 
-        $result = $flink->find(true);
+        if (!$flink->find(true)) {
+            throw new NoResultException($flink);
+        }
 
-        return empty($result) ? null : $flink;
+        return $flink;
     }
 
     static function getByForeignID($foreign_id, $service)
     {
         if (empty($foreign_id) || empty($service)) {
-            return null;
-        } else {
-            $flink = new Foreign_link();
-            $flink->service = $service;
-            $flink->foreign_id = $foreign_id;
-            $flink->limit(1);
+            throw new ServerException('Empty foreign_id or service for Foreign_link::getByForeignID');
+        }
 
-            $result = $flink->find(true);
+        $flink = new Foreign_link();
+        $flink->service = $service;
+        $flink->foreign_id = $foreign_id;
+        $flink->limit(1);
 
-            return empty($result) ? null : $flink;
+        if (!$flink->find(true)) {
+            throw new NoResultException($flink);
         }
+
+        return $flink;
     }
 
     function set_flags($noticesend, $noticerecv, $replysync, $friendsync)
@@ -124,21 +127,21 @@ class Foreign_link extends Managed_DataObject
 
         $fuser->limit(1);
 
-        if ($fuser->find(true)) {
-            return $fuser;
+        if (!$fuser->find(true)) {
+            throw new NoResultException($fuser);
         }
 
-        return null;
+        return $fuser;
     }
 
     function getUser()
     {
-        return User::getKV($this->user_id);
+        return Profile::getByID($this->user_id)->getUser();
     }
 
     function getProfile()
     {
-        return Profile::getKV('id', $this->user_id);
+        return Profile::getByID($this->user_id);
     }
 
     // Make sure we only ever delete one record at a time