Qvitter API changes (thanks hannes2peer)

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

diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php
index 67d8651fa97537f0bde2061bc188775a911d9eda..ec36dc342356db720e7ce37fe9265c6aada4f92d 100644 (file)
--- a/classes/Foreign_user.php
+++ b/classes/Foreign_user.php
@@ -17,9 +17,6 @@ class Foreign_user extends Managed_DataObject
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
-    /* Static get */
-    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Foreign_user',$k,$v); }
-
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
 
@@ -44,20 +41,18 @@ class Foreign_user extends Managed_DataObject
         );
     }
 
-    // XXX:  This only returns a 1->1 single obj mapping.  Change?  Or make
-    // a getForeignUsers() that returns more than one? --Zach
     static function getForeignUser($id, $service) {
+
         $fuser = new Foreign_user();
-        $fuser->whereAdd("service = $service");
-        $fuser->whereAdd("id = $id");
+
+        $fuser->id      = $id;
+        $fuser->service = $service;
+
         $fuser->limit(1);
 
-        if ($fuser->find()) {
-            $fuser->fetch();
-            return $fuser;
-        }
+        $result = $fuser->find(true);
 
-        return null;
+        return empty($result) ? null : $fuser;
     }
 
     static function getByNickname($nickname, $service)