diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 21:53:48 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 21:53:48 +0000 |
| commit | be37104ac63cd25f2eac831ca03d6d2b19976e1c (patch) | |
| tree | 5b168134f2b07933831daedd8cf2641ffb6c5c7d /mod/profile/icon.php | |
| parent | d45a24be28b2eb2d0c2731708b589788a5b87215 (diff) | |
| download | elgg-be37104ac63cd25f2eac831ca03d6d2b19976e1c.tar.gz elgg-be37104ac63cd25f2eac831ca03d6d2b19976e1c.tar.bz2 | |
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
Diffstat (limited to 'mod/profile/icon.php')
| -rw-r--r-- | mod/profile/icon.php | 7 |
1 files changed, 3 insertions, 4 deletions
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) { |