From 728caf13f8656fa12253dd512a1fa49897a0566f Mon Sep 17 00:00:00 2001
From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Mon, 25 Jan 2016 13:24:56 +0100
Subject: Adding support of -1 as size to be passed into get and getFile

---
 lib/private/avatar.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'lib/private/avatar.php')

diff --git a/lib/private/avatar.php b/lib/private/avatar.php
index d4e5f5225dc..a276fb7ccf9 100644
--- a/lib/private/avatar.php
+++ b/lib/private/avatar.php
@@ -58,10 +58,8 @@ class Avatar implements \OCP\IAvatar {
 	}
 
 	/**
-	 * get the users avatar
-	 * @param int $size size in px of the avatar, avatars are square, defaults to 64
-	 * @return boolean|\OCP\IImage containing the avatar or false if there's no image
-	*/
+	 * @inheritdoc
+	 */
 	public function get ($size = 64) {
 		try {
 			$file = $this->getFile($size);
@@ -135,16 +133,16 @@ class Avatar implements \OCP\IAvatar {
 	}
 
 	/**
-	 * Get the File of an avatar of size $size.
-	 *
-	 * @param int $size
-	 * @return File
-	 * @throws NotFoundException
+	 * @inheritdoc
 	 */
 	public function getFile($size) {
 		$ext = $this->getExtention();
 
-		$path = 'avatar.' . $size . '.' . $ext;
+		if ($size === -1) {
+			$path = 'avatar.' . $ext;
+		} else {
+			$path = 'avatar.' . $size . '.' . $ext;
+		}
 
 		try {
 			$file = $this->folder->get($path);
@@ -157,7 +155,9 @@ class Avatar implements \OCP\IAvatar {
 			/** @var File $file */
 			$file = $this->folder->get('avatar.' . $ext);
 			$avatar->loadFromData($file->getContent());
-			$avatar->resize($size);
+			if ($size !== -1) {
+				$avatar->resize($size);
+			}
 			$file = $this->folder->newFile($path);
 			$file->putContent($avatar->data());
 		}
-- 
cgit v1.2.3