From: Sem <sembrestels@riseup.net>
Date: Thu, 17 May 2012 11:43:27 +0000 (+0200)
Subject: Fixes #4396. Revert avatar also deletes avatar's files and crop coords now.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=3643efd144c3a9190018100665d02ec798989bfd;p=lorea%2Felgg.git

Fixes #4396. Revert avatar also deletes avatar's files and crop coords now.
---

diff --git a/actions/avatar/revert.php b/actions/avatar/revert.php
index 8cff40a68..bc84e9298 100644
--- a/actions/avatar/revert.php
+++ b/actions/avatar/revert.php
@@ -6,6 +6,25 @@
 $guid = get_input('guid');
 $user = get_entity($guid);
 if ($user) {
+	// Delete all icons from diskspace
+	$icon_sizes = elgg_get_config('icon_sizes');
+	foreach ($icon_sizes as $name => $size_info) {
+		$file = new ElggFile();
+		$file->owner_guid = $guid;
+		$file->setFilename("profile/{$guid}{$name}.jpg");
+		$filepath = $file->getFilenameOnFilestore();
+		if (!$file->delete()) {
+			elgg_log("Avatar file revert failed. Remove $filepath manually, please.", 'WARNING');
+		}
+	}
+	
+	// Revert crop coords
+	unset($user->x1);
+	unset($user->x2);
+	unset($user->y1);
+	unset($user->y2);
+	
+	// Revert icon
 	unset($user->icontime);
 	system_message(elgg_echo('avatar:revert:success'));
 } else {