From be37104ac63cd25f2eac831ca03d6d2b19976e1c Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Aug 2010 21:53:48 +0000
Subject: Merged r6684:6694 from 1.7 branch to trunk (pages plugin was manually
 merged due to standardization of code in trunk but not branch)

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

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

diff --git a/mod/profile/icon.php b/mod/profile/icon.php
index da7667c8b..d7d7247c5 100644
--- a/mod/profile/icon.php
+++ b/mod/profile/icon.php
@@ -1,7 +1,7 @@
 <?php
 /**
 * Elgg profile icon
-* 
+*
 * @package ElggProfile
 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
 * @author Curverider Ltd <info@elgg.com>
@@ -13,7 +13,6 @@ require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
 
 // Get the owning user
 $user = page_owner_entity();
-$username = $user->username;
 
 // Get the size
 $size = strtolower(get_input('size'));
@@ -30,13 +29,13 @@ if (!$user) {
 // Try and get the icon
 $filehandler = new ElggFile();
 $filehandler->owner_guid = $user->getGUID();
-$filehandler->setFilename("profile/" . $username . $size . ".jpg");
+$filehandler->setFilename("profile/" .  $user->getGUID() . $size . ".jpg");
 
 $success = false;
 if ($filehandler->open("read")) {
 	if ($contents = $filehandler->read($filehandler->size())) {
 		$success = true;
-	} 
+	}
 }
 
 if (!$success) {
-- 
cgit v1.2.3