Memcache returns false on cache miss

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

diff --git a/classes/Profile.php b/classes/Profile.php
index ff63bc79e01063e8c63a244a229fa122a0b51e9f..1dffbd573f87937dad840781dfb7fb36dbdf93f3 100644 (file)
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -22,26 +22,26 @@ if (!defined('LACONICA')) { exit(1); }
 /**
  * Table Definition for profile
  */
-require_once 'DB/DataObject.php';
+require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-class Profile extends DB_DataObject
+class Profile extends Memcached_DataObject 
 {
     ###START_AUTOCODE
     /* the code below is auto generated do not remove the above tag */
 
     public $__table = 'profile';                         // table name
     public $id;                              // int(4)  primary_key not_null
-    public $nickname;                        // varchar(64)   not_null
-    public $fullname;                        // varchar(255)
-    public $profileurl;                      // varchar(255)
-    public $homepage;                        // varchar(255)
-    public $bio;                             // varchar(140)
-    public $location;                        // varchar(255)
+    public $nickname;                        // varchar(64)  multiple_key not_null
+    public $fullname;                        // varchar(255)  multiple_key
+    public $profileurl;                      // varchar(255)  
+    public $homepage;                        // varchar(255)  multiple_key
+    public $bio;                             // varchar(140)  multiple_key
+    public $location;                        // varchar(255)  multiple_key
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
 
     /* Static get */
-    function staticGet($k,$v=NULL) { return DB_DataObject::staticGet('Profile',$k,$v); }
+    function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Profile',$k,$v); }
 
     /* the code above is auto generated do not remove the tag below */
     ###END_AUTOCODE
@@ -73,7 +73,7 @@ class Profile extends DB_DataObject
                }
        }
 
-       static function setOriginal($source) {
+       function setOriginal($source) {
 
                $info = @getimagesize($source);
 
@@ -81,7 +81,7 @@ class Profile extends DB_DataObject
                        return NULL;
                }
 
-               $filename = common_avatar_filename($this,
+               $filename = common_avatar_filename($this->id,
                                                                                   image_type_to_extension($info[2]),
                                                                                   NULL, common_timestamp());
                $filepath = common_avatar_path($filename);
@@ -133,4 +133,23 @@ class Profile extends DB_DataObject
                }
                return true;
        }
+
+       function getBestName() {
+               return ($this->fullname) ? $this->fullname : $this->nickname;
+       }
+
+    # Get latest notice on or before date; default now
+       function getCurrentNotice($dt=NULL) {
+               $notice = new Notice();
+               $notice->profile_id = $this->id;
+               if ($dt) {
+                       $notice->whereAdd('created < "' . $dt . '"');
+               }
+               $notice->orderBy('created DESC, notice.id DESC');
+               $notice->limit(1);
+               if ($notice->find(true)) {
+                       return $notice;
+               }
+               return NULL;
+       }
 }