Fix error when maildaemon tries to report a message parsing error

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

diff --git a/classes/Foreign_user.php b/classes/Foreign_user.php
index 6dbad9aa2e68cd16fd80148e54d5882fce7a2827..d70923caa5848f451b19250409b40683140478e3 100644 (file)
--- a/classes/Foreign_user.php
+++ b/classes/Foreign_user.php
@@ -2,9 +2,9 @@
 /**
  * Table Definition for foreign_user
  */
-require_once 'DB/DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Foreign_user extends DB_DataObject 
+class Foreign_user extends Memcached_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
@@ -18,16 +18,17 @@ class Foreign_user extends DB_DataObject
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Foreign_user',$k,$v); }
+    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
        
-       function getForeignUser($user_id, $service) {
-               
-               $fuser = DB_DataObject::factory('foreign_user');
+       // 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("user_id = $user_id");
+               $fuser->whereAdd("id = $id");
                $fuser->limit(1);
                
                if ($fuser->find()) {
@@ -38,29 +39,4 @@ class Foreign_user extends DB_DataObject
                return NULL;            
        }
        
-       
-       static function save($fields) {
-               
-               extract($fields);
-                               
-               $fuser = new Foreign_user();
-               
-               $fuser->id = $id;
-               $fuser->service = $service;
-               $fuser->uri = $uri;
-               $fuser->nickname = $nickname;           
-               $fuser->user_id = $user_id;
-               $fuser->credentials = $credentials;
-               $fuser->created = common_sql_now();
-               
-               $result = $fuser->insert();
-
-               if (!$result) {
-                       common_log_db_error($fuser, 'INSERT', __FILE__);
-                       return FALSE;
-               }
-
-               return $fuser;
-       }
-       
 }