From b6aaba915151dd07800761a01b67ffffaee1302b Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Fri, 14 May 2010 20:01:59 +0000
Subject: merge -r5898:5928 (not excluding riverdashboard, notifications, and
 messageboard) from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@6058 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/profile/icon.php | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'mod/profile/icon.php')

diff --git a/mod/profile/icon.php b/mod/profile/icon.php
index 463eb3db5..da7667c8b 100644
--- a/mod/profile/icon.php
+++ b/mod/profile/icon.php
@@ -20,6 +20,13 @@ $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();
-- 
cgit v1.2.3