aboutsummaryrefslogtreecommitdiff
path: root/mod/file
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 21:32:54 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 21:32:54 +0000
commitf49fdf4e1c80fe5bde922c25bdd6ca0e2c912ddb (patch)
treeeb2fdb272ba76e83af60378d05602a26a265be36 /mod/file
parent9ebb6cff1cf22d4fb708c4ced37604c6cf5bbfae (diff)
downloadelgg-f49fdf4e1c80fe5bde922c25bdd6ca0e2c912ddb.tar.gz
elgg-f49fdf4e1c80fe5bde922c25bdd6ca0e2c912ddb.tar.bz2
Refs #2124: Using get_loggedin_user functions instead of $vars['user'], $_SESSION['user'], etc.
git-svn-id: http://code.elgg.org/elgg/trunk@7139 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/file')
-rw-r--r--mod/file/actions/delete.php2
-rw-r--r--mod/file/actions/save.php2
-rw-r--r--mod/file/world.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/mod/file/actions/delete.php b/mod/file/actions/delete.php
index e7ad90289..9357d4955 100644
--- a/mod/file/actions/delete.php
+++ b/mod/file/actions/delete.php
@@ -49,7 +49,7 @@
} else {
- $container = $_SESSION['user'];
+ $container = get_loggedin_user();
register_error(elgg_echo("file:deletefailed"));
}
diff --git a/mod/file/actions/save.php b/mod/file/actions/save.php
index 5e2045ae8..923bc043b 100644
--- a/mod/file/actions/save.php
+++ b/mod/file/actions/save.php
@@ -17,7 +17,7 @@
if (!$file = get_entity($guid)) {
register_error(elgg_echo("file:uploadfailed"));
- forward($CONFIG->wwwroot . "pg/file/" . $_SESSION['user']->username);
+ forward($CONFIG->wwwroot . "pg/file/" . get_loggedin_user()->username);
exit;
}
diff --git a/mod/file/world.php b/mod/file/world.php
index eee3609fb..21e741184 100644
--- a/mod/file/world.php
+++ b/mod/file/world.php
@@ -13,7 +13,7 @@
// Get the current page's owner
$page_owner = page_owner_entity();
if ($page_owner === false || is_null($page_owner)) {
- $page_owner = $_SESSION['user'];
+ $page_owner = get_loggedin_user();
set_page_owner($_SESSION['guid']);
}