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

2 files changed, 11 insertions, 11 deletions

diff --git a/mod/profile/actions/cropicon.php b/mod/profile/actions/cropicon.php
index 5bba84a8c..b0dc0fa61 100644
--- a/mod/profile/actions/cropicon.php
+++ b/mod/profile/actions/cropicon.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Elgg profile plugin upload new user icon action
- * 
+ *
  * @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>
@@ -28,28 +28,28 @@ $filehandler = new ElggFile();
 $filehandler->owner_guid = $profile_owner->getGUID();
 $filehandler->setFilename("profile/" . $profile_owner->username . "master" . ".jpg");
 $filename = $filehandler->getFilenameOnFilestore();
-	
+
 $topbar = get_resized_image_from_existing_file($filename, 16, 16, true, $x1, $y1, $x2, $y2, TRUE);
 $tiny = get_resized_image_from_existing_file($filename, 25, 25, true, $x1, $y1, $x2, $y2, TRUE);
 $small = get_resized_image_from_existing_file($filename, 40, 40, true, $x1, $y1, $x2, $y2, TRUE);
 $medium = get_resized_image_from_existing_file($filename, 100, 100, true, $x1, $y1, $x2, $y2, TRUE);
-	
+
 if ($small !== FALSE && $medium !== FALSE && $tiny !== FALSE) {
 	$filehandler = new ElggFile();
 	$filehandler->owner_guid = $profile_owner->getGUID();
-	$filehandler->setFilename("profile/" .  $profile_owner->username . "medium.jpg");
+	$filehandler->setFilename("profile/" .  $profile_owner->guid . "medium.jpg");
 	$filehandler->open("write");
 	$filehandler->write($medium);
 	$filehandler->close();
-	$filehandler->setFilename("profile/" .  $profile_owner->username . "small.jpg");
+	$filehandler->setFilename("profile/" .  $profile_owner->guid . "small.jpg");
 	$filehandler->open("write");
 	$filehandler->write($small);
 	$filehandler->close();
-	$filehandler->setFilename("profile/" .  $profile_owner->username . "tiny.jpg");
+	$filehandler->setFilename("profile/" .  $profile_owner->guid . "tiny.jpg");
 	$filehandler->open("write");
 	$filehandler->write($tiny);
 	$filehandler->close();
-	$filehandler->setFilename("profile/" .  $profile_owner->username . "topbar.jpg");
+	$filehandler->setFilename("profile/" .  $profile_owner->guid . "topbar.jpg");
 	$filehandler->open("write");
 	$filehandler->write($topbar);
 	$filehandler->close();
@@ -58,14 +58,14 @@ if ($small !== FALSE && $medium !== FALSE && $tiny !== FALSE) {
 	$profile_owner->x2 = $x2;
 	$profile_owner->y1 = $y1;
 	$profile_owner->y2 = $y2;
-	
+
 	$profile_owner->icontime = time();
 
 	system_message(elgg_echo("profile:icon:uploaded"));
 } else {
 	register_error(elgg_echo("profile:icon:notfound"));
 }
-		
+
 //forward the user back to the upload page to crop
 $url = "{$vars['url']}pg/profile/{$profile_owner->username}/edit/icon";
 
diff --git a/mod/profile/actions/iconupload.php b/mod/profile/actions/iconupload.php
index a0cb24c3d..23d1967a6 100644
--- a/mod/profile/actions/iconupload.php
+++ b/mod/profile/actions/iconupload.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Elgg profile plugin upload new user icon action
- * 
+ *
  * @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>
@@ -41,7 +41,7 @@ foreach ($icon_sizes as $name => $size_info) {
 		//@todo Make these actual entities.  See exts #348.
 		$file = new ElggFile();
 		$file->owner_guid = $profile_owner_guid;
-		$file->setFilename("profile/{$profile_username}{$name}.jpg");
+		$file->setFilename("profile/{$profile_owner_guid}{$name}.jpg");
 		$file->open('write');
 		$file->write($resized);
 		$file->close();