diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 22:37:30 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-08-22 22:37:30 +0000 |
commit | ca08eb6d170d375ef4fca53604956f3474c7db19 (patch) | |
tree | a1e96c6b0ae322fab93373a66e1951e2b3b9be48 /actions/email | |
parent | be37104ac63cd25f2eac831ca03d6d2b19976e1c (diff) | |
download | elgg-ca08eb6d170d375ef4fca53604956f3474c7db19.tar.gz elgg-ca08eb6d170d375ef4fca53604956f3474c7db19.tar.bz2 |
Merged r6701:6756 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6849 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'actions/email')
-rw-r--r-- | actions/email/save.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/actions/email/save.php b/actions/email/save.php index 7493538f9..34fce3c30 100644 --- a/actions/email/save.php +++ b/actions/email/save.php @@ -8,16 +8,13 @@ * @link http://elgg.org/ */ -global $CONFIG; - gatekeeper(); $email = get_input('email'); $user_id = get_input('guid'); -$user = ""; if (!$user_id) { - $user = $_SESSION['user']; + $user = get_loggedin_user(); } else { $user = get_entity($user_id); } @@ -47,7 +44,3 @@ if ($user) { } else { register_error(elgg_echo('email:save:fail')); } - -//forward($_SERVER['HTTP_REFERER']); -//exit; -?> |