From c8392ed58d8c352b9dd68f23d140f96d9520c5fc Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 2 Oct 2008 10:47:49 -0400
Subject: [PATCH] use pkeyGet for Avatar

darcs-hash:20081002144749-5ed1f-a5503625b811f28a853712d4ddd4a76813f24bc1.gz
---
 classes/Avatar.php  |  4 ++++
 classes/Profile.php | 15 ++++-----------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/classes/Avatar.php b/classes/Avatar.php
index fc2361e2f5..05a5ee8ef3 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 1dffbd573f..a37821e1be 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() {