Upgraded to Elgg 1.8.6.

Merge tag '1.8.6' of git://github.com/Elgg/Elgg into lorea-preprod

Elgg 1.8.6 release

2 files changed, 34 insertions, 15 deletions

diff --git a/actions/avatar/remove.php b/actions/avatar/remove.php
new file mode 100644
index 000000000..cd38e456a
--- /dev/null
+++ b/actions/avatar/remove.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * Avatar remove action
+ */
+
+$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 remove failed. Remove $filepath manually, please.", 'WARNING');
+		}
+	}
+	
+	// Remove crop coords
+	unset($user->x1);
+	unset($user->x2);
+	unset($user->y1);
+	unset($user->y2);
+	
+	// Remove icon
+	unset($user->icontime);
+	system_message(elgg_echo('avatar:remove:success'));
+} else {
+	register_error(elgg_echo('avatar:remove:fail'));
+}
+
+forward(REFERER);
diff --git a/actions/avatar/revert.php b/actions/avatar/revert.php
deleted file mode 100644
index 8cff40a68..000000000
--- a/actions/avatar/revert.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/**
- * Avatar revert action
- */
-
-$guid = get_input('guid');
-$user = get_entity($guid);
-if ($user) {
-	unset($user->icontime);
-	system_message(elgg_echo('avatar:revert:success'));
-} else {
-	register_error(elgg_echo('avatar:revert:fail'));
-}
-
-forward(REFERER);