Admin cropping of other user icons now works as expected.

git-svn-id: https://code.elgg.org/elgg/trunk@3391 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/profile/actions/cropicon.php b/mod/profile/actions/cropicon.php
index 58f12a5126da3e553692b1df748e016ce5489331..9e60ffec4fc854414d80d7b1fd4f86ffa4d06e30 100644 (file)
--- a/mod/profile/actions/cropicon.php
+++ b/mod/profile/actions/cropicon.php
@@ -35,20 +35,20 @@
                                        && $tiny !== false) {\r
                                \r
                                        $filehandler = new ElggFile();\r
-                                       $filehandler->owner_guid = $_SESSION['user']->getGUID();\r
-                                       $filehandler->setFilename("profile/" . $_SESSION['user']->username . "medium.jpg");\r
+                                       $filehandler->owner_guid = $user->getGUID();\r
+                                       $filehandler->setFilename("profile/" .  $user->username . "medium.jpg");\r
                                        $filehandler->open("write");\r
                                        $filehandler->write($medium);\r
                                        $filehandler->close();\r
-                                       $filehandler->setFilename("profile/" . $_SESSION['user']->username . "small.jpg");\r
+                                       $filehandler->setFilename("profile/" .  $user->username . "small.jpg");\r
                                        $filehandler->open("write");\r
                                        $filehandler->write($small);\r
                                        $filehandler->close();\r
-                                       $filehandler->setFilename("profile/" . $_SESSION['user']->username . "tiny.jpg");\r
+                                       $filehandler->setFilename("profile/" .  $user->username . "tiny.jpg");\r
                                        $filehandler->open("write");\r
                                        $filehandler->write($tiny);\r
                                        $filehandler->close();\r
-                                       $filehandler->setFilename("profile/" . $_SESSION['user']->username . "topbar.jpg");\r
+                                       $filehandler->setFilename("profile/" .  $user->username . "topbar.jpg");\r
                                        $filehandler->open("write");\r
                                        $filehandler->write($topbar);\r
                                        $filehandler->close();\r
@@ -58,7 +58,7 @@
                                        $user->y1 = $y1;\r
                                        $user->y2 = $y2;\r
                                        \r
-                                       $_SESSION['user']->icontime = time();\r
+                                        $user->icontime = time();\r
                                        \r
                                        system_message(elgg_echo("profile:icon:uploaded"));\r
                                \r
@@ -68,7 +68,7 @@
                        \r
            //forward the user back to the upload page to crop\r
            \r
-           $url = $vars['url'] . "mod/profile/editicon.php";\r
+           $url = $vars['url'] . "pg/profile/{$user->username}/editicon/";\r
                        \r
                if (isloggedin()) forward($url);\r
 \r