Merge github.com:Elgg/Elgg

Conflicts:
	engine/lib/input.php

1 files changed, 0 insertions, 53 deletions

diff --git a/mod/profile/icon.php b/mod/profile/icon.php
deleted file mode 100644
index a624c0811..000000000
--- a/mod/profile/icon.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
-* Elgg profile icon
-*
-* @package ElggProfile
-*/
-
-require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
-
-// Get the owning user
-$user = elgg_get_page_owner_entity();
-
-// Get the size
-$size = strtolower(get_input('size'));
-if (!in_array($size,array('large','medium','small','tiny','master','topbar')))
-	$size = "medium";
-
-// If user doesn't exist, return default icon
-if (!$user) {
-	$path = elgg_view("icon/user/default/$size");
-	header("Location: $path");
-	exit;
-}
-
-// Try and get the icon
-$filehandler = new ElggFile();
-$filehandler->owner_guid = $user->getGUID();
-$filehandler->setFilename("profile/" .  $user->getGUID() . $size . ".jpg");
-
-$success = false;
-if ($filehandler->open("read")) {
-	if ($contents = $filehandler->read($filehandler->size())) {
-		$success = true;
-	}
-}
-
-if (!$success) {
-	$path = elgg_view("icon/user/default/$size");
-	header("Location: $path");
-	exit;
-}
-
-header("Content-type: image/jpeg");
-header('Expires: ' . date('r',time() + 864000));
-header("Pragma: public");
-header("Cache-Control: public");
-header("Content-Length: " . strlen($contents));
-
-$splitString = str_split($contents, 1024);
-
-foreach($splitString as $chunk) {
-	echo $chunk;
-}
\ No newline at end of file