From 158db509664cdc57a9d11044db6cc0eb73736f8d Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Mon, 2 Sep 2013 21:22:38 +0300
Subject: [PATCH] OC_Avatar support

---
 ajax/otpoll.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ajax/otpoll.php b/ajax/otpoll.php
index b73a8bba..c2a3d220 100644
--- a/ajax/otpoll.php
+++ b/ajax/otpoll.php
@@ -59,8 +59,21 @@ try{
 					function($x){
 						$x['display_name'] = \OCP\User::getDisplayName($x['uid']);
 						
-						// Stub
-						$x['avatar_url'] = \OCP\Util::linkToRoute('documents_user_avatar');
+						if (!method_exists('\OCP\Avatar', 'get')){
+							$x['avatar_url'] = \OCP\Util::linkToRoute('documents_user_avatar');
+						} else {
+							$avatar = new \OC_Avatar();
+							$image = $avatar->get($x['uid'], 64);
+							if ($image instanceof \OC_Image) {
+								$x['avatar_url'] = \OC_Helper::linkToRoute(
+										'core_avatar_get',
+										array( 'user' => $x['uid'], 'size' => 64)
+								);
+							} else {
+								//shortcircuit if it's not an image
+								$x['avatar_url'] = \OCP\Util::linkToRoute('documents_user_avatar');
+							}
+						}
 						return $x;
 					}, 
 					$members