summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/Avatar.php4
-rw-r--r--classes/Profile.php15
2 files changed, 8 insertions, 11 deletions
diff --git a/classes/Avatar.php b/classes/Avatar.php
index fc2361e2f..05a5ee8ef 100644
--- a/classes/Avatar.php
+++ b/classes/Avatar.php
@@ -87,4 +87,8 @@ class Avatar extends Memcached_DataObject
return NULL;
}
}
+
+ function &pkeyGet($kv) {
+ return Memcached_DataObject::pkeyGet('Avatar', $kv);
+ }
}
diff --git a/classes/Profile.php b/classes/Profile.php
index 1dffbd573..a37821e1b 100644
--- a/classes/Profile.php
+++ b/classes/Profile.php
@@ -47,19 +47,12 @@ class Profile extends Memcached_DataObject
###END_AUTOCODE
function getAvatar($width, $height=NULL) {
- $avatar = DB_DataObject::factory('avatar');
- $avatar->profile_id = $this->id;
- $avatar->width = $width;
if (is_null($height)) {
- $avatar->height = $width;
- } else {
- $avatar->height = $height;
- }
- if ($avatar->find(true)) {
- return $avatar;
- } else {
- return NULL;
+ $height = $width;
}
+ return Avatar::pkeyGet(array('profile_id' => $this->id,
+ 'width' => $width,
+ 'height' => $height));
}
function getOriginalAvatar() {